tree f5ec3d92e66d6047d134f4278080437ad9562196
parent 22fed39775c6f06e275075e1570e1cebb12593e0
parent 232cad8413a0bfbd25f11cc19fd13dfd85e1d8ad
author Linus Torvalds <torvalds@linux-foundation.org> 1459552114 -0500
committer Linus Torvalds <torvalds@linux-foundation.org> 1459552114 -0500

Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "This has a few fixes Dave Sterba had queued up.  These are all pretty
  small, but since they were tested I decided against waiting for more"

* 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: transaction_kthread() is not freezable
  btrfs: cleaner_kthread() doesn't need explicit freeze
  btrfs: do not write corrupted metadata blocks to disk
  btrfs: csum_tree_block: return proper errno value