diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-05 12:17:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-05 12:17:24 -0700 |
| commit | e62063d69911886a5a92c719d262a2a87e1e5b60 (patch) | |
| tree | c72519e2092ccba257ab74318b21eb924a1ee9cf /fs/cifs | |
| parent | 85f6d2dbfdc7e6c6ac955012c03ce31a8f947b94 (diff) | |
| parent | b208c2f7ceafacbc44f13d1b5a9fbada98226183 (diff) | |
| download | linux-e62063d69911886a5a92c719d262a2a87e1e5b60.tar.gz linux-e62063d69911886a5a92c719d262a2a87e1e5b60.tar.bz2 linux-e62063d69911886a5a92c719d262a2a87e1e5b60.zip | |
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
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions