aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-04 12:26:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-04 12:26:56 -0800
commit878a876b2e10888afe53766dcca33f723ae20edc (patch)
tree9fccb0714a2ec6e19802acdd947e29b8a6fb0a96 /init
parentd7512f79fd6cb8e2d9b78770289df6391a867ca1 (diff)
parent60efa5eb2e886852a0d5f9e1ffa7c896a1099da8 (diff)
downloadlinux-linaro-stable-878a876b2e10888afe53766dcca33f723ae20edc.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "Filipe is fixing compile and boot problems with our crc32c rework, and Josef has disabled snapshot aware defrag for now. As the number of snapshots increases, we're hitting OOM. For the short term we're disabling things until a bigger fix is ready" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: use late_initcall instead of module_init Btrfs: use btrfs_crc32c everywhere instead of libcrc32c Btrfs: disable snapshot aware defrag for now
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions