diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-31 17:05:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-31 17:05:37 -0700 |
| commit | acea568fa9eaeffbf949d15b2f7c9c346e16aae3 (patch) | |
| tree | 5e85297688d2b343e390bcb660930c7d4eb659fa /net/xfrm/xfrm_algo.c | |
| parent | c6fd4fc708306b7d7187c324ea0a889eda411ebb (diff) | |
| parent | 00d80e342c0f4f1990ab69f594ee1e2348e51dd9 (diff) | |
| download | linux-acea568fa9eaeffbf949d15b2f7c9c346e16aae3.tar.gz | |
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 'net/xfrm/xfrm_algo.c')
0 files changed, 0 insertions, 0 deletions