tree 9fccb0714a2ec6e19802acdd947e29b8a6fb0a96
parent d7512f79fd6cb8e2d9b78770289df6391a867ca1
parent 60efa5eb2e886852a0d5f9e1ffa7c896a1099da8
author Linus Torvalds <torvalds@linux-foundation.org> 1391545616 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1391545616 -0800

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