summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2013-10-19 01:46:21 +0200
committerLinus Torvalds2013-10-19 01:46:21 +0200
commitbdeeab62a611f1f7cd48fd285ce568e8dcd0455a (patch)
tree93e5e16b5ef769093dca6cb23e44b83433f4b688 /Makefile
parentMerge tag 'pm+acpi-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentBtrfs: release path before starting transaction in can_nocow_extent (diff)
downloadkernel-qcow2-linux-bdeeab62a611f1f7cd48fd285ce568e8dcd0455a.tar.gz
kernel-qcow2-linux-bdeeab62a611f1f7cd48fd285ce568e8dcd0455a.tar.xz
kernel-qcow2-linux-bdeeab62a611f1f7cd48fd285ce568e8dcd0455a.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason: "Sage hit a deadlock with ceph on btrfs, and Josef tracked it down to a regression in our initial rc1 pull. When doing nocow writes we were sometimes starting a transaction with locks held" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: release path before starting transaction in can_nocow_extent
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions