From: Linus Torvalds Date: Sat, 5 Oct 2013 19:17:24 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... X-Git-Tag: accepted/tizen/common/20141203.182822~1334 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e62063d69911886a5a92c719d262a2a87e1e5b60;p=platform%2Fkernel%2Flinux-arm64.git Merge branch 'for-linus' of git://git./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 --- e62063d69911886a5a92c719d262a2a87e1e5b60