diff options
| author | Linus Torvalds <[email protected]> | 2015-08-01 00:05:37 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-08-01 00:05:37 +0000 |
| commit | acea568fa9eaeffbf949d15b2f7c9c346e16aae3 (patch) | |
| tree | 5e85297688d2b343e390bcb660930c7d4eb659fa /drivers/net/xen-netback/interface.c | |
| parent | Merge tag 'sound-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| parent | Btrfs: fix quick exhaustion of the system array in the superblock (diff) | |
| download | kernel-acea568fa9eaeffbf949d15b2f7c9c346e16aae3.tar.gz kernel-acea568fa9eaeffbf949d15b2f7c9c346e16aae3.zip | |
Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"Filipe fixed up a hard to trigger ENOSPC regression from our merge
window pull, and we have a few other smaller fixes"
* 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix quick exhaustion of the system array in the superblock
btrfs: its btrfs_err() instead of btrfs_error()
btrfs: Avoid NULL pointer dereference of free_extent_buffer when read_tree_block() fail
btrfs: Fix lockdep warning of btrfs_run_delayed_iputs()
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
0 files changed, 0 insertions, 0 deletions