summaryrefslogtreecommitdiffstats
path: root/fs/proc/version.c
diff options
context:
space:
mode:
authorLinus Torvalds2014-04-11 23:16:53 +0200
committerLinus Torvalds2014-04-11 23:16:53 +0200
commit3123bca71993c2346a458875488863772c1d5dc4 (patch)
treea1e082130a3d7a4ba1faaea60e699939cf821ab6 /fs/proc/version.c
parentMerge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/e... (diff)
parentBtrfs: fix compile warnings on on avr32 platform (diff)
downloadkernel-qcow2-linux-3123bca71993c2346a458875488863772c1d5dc4.tar.gz
kernel-qcow2-linux-3123bca71993c2346a458875488863772c1d5dc4.tar.xz
kernel-qcow2-linux-3123bca71993c2346a458875488863772c1d5dc4.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull second set of btrfs updates from Chris Mason: "The most important changes here are from Josef, fixing a btrfs regression in 3.14 that can cause corruptions in the extent allocation tree when snapshots are in use. Josef also fixed some deadlocks in send/recv and other assorted races when balance is running" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (23 commits) Btrfs: fix compile warnings on on avr32 platform btrfs: allow mounting btrfs subvolumes with different ro/rw options btrfs: export global block reserve size as space_info btrfs: fix crash in remount(thread_pool=) case Btrfs: abort the transaction when we don't find our extent ref Btrfs: fix EINVAL checks in btrfs_clone Btrfs: fix unlock in __start_delalloc_inodes() Btrfs: scrub raid56 stripes in the right way Btrfs: don't compress for a small write Btrfs: more efficient io tree navigation on wait_extent_bit Btrfs: send, build path string only once in send_hole btrfs: filter invalid arg for btrfs resize Btrfs: send, fix data corruption due to incorrect hole detection Btrfs: kmalloc() doesn't return an ERR_PTR Btrfs: fix snapshot vs nocow writting btrfs: Change the expanding write sequence to fix snapshot related bug. btrfs: make device scan less noisy btrfs: fix lockdep warning with reclaim lock inversion Btrfs: hold the commit_root_sem when getting the commit root during send Btrfs: remove transaction from send ...
Diffstat (limited to 'fs/proc/version.c')
0 files changed, 0 insertions, 0 deletions