diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-09 16:39:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-09 16:39:35 -0700 |
| commit | 175d58cfed70f132b8d4df39e19267ad6094bd16 (patch) | |
| tree | 9eca7048d9d81c0be1f23dfd558a3959ae4d5521 /kernel/nsproxy.c | |
| parent | 38aa0a59a6669af702c523e1d525b24ff5fd471b (diff) | |
| parent | 7d35199e15b82a4d1a20049153b03e6258ce79f7 (diff) | |
| download | linux-175d58cfed70f132b8d4df39e19267ad6094bd16.tar.bz2 | |
Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"These are small and assorted. Neil's is the oldest, I dropped the
ball thinking he was going to send it in"
* 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: support NFSv2 export
Btrfs: open_ctree: Fix possible memory leak
Btrfs: fix deadlock when finalizing block group creation
Btrfs: update fix for read corruption of compressed and shared extents
Btrfs: send, fix corner case for reference overwrite detection
Diffstat (limited to 'kernel/nsproxy.c')
0 files changed, 0 insertions, 0 deletions