tree c72519e2092ccba257ab74318b21eb924a1ee9cf
parent 85f6d2dbfdc7e6c6ac955012c03ce31a8f947b94
parent b208c2f7ceafacbc44f13d1b5a9fbada98226183
author Linus Torvalds <torvalds@linux-foundation.org> 1381000644 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1381000644 -0700

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

Pull btrfs fixes from Chris Mason:
 "This is a small collection of fixes, including a regression fix from
  Liu Bo that solves rare crashes with compression on.

  I've merged my for-linus up to 3.12-rc3 because the top commit is only
  meant for 3.12.  The rest of the fixes are also available in my master
  branch on top of my last 3.11 based pull"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: Fix crash due to not allocating integrity data for a bioset
  Btrfs: fix a use-after-free bug in btrfs_dev_replace_finishing
  Btrfs: eliminate races in worker stopping code
  Btrfs: fix crash of compressed writes
  Btrfs: fix transid verify errors when recovering log tree