From: Linus Torvalds Date: Fri, 18 Oct 2013 23:46:21 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... X-Git-Tag: v5.15~19133 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bdeeab62a611f1f7cd48fd285ce568e8dcd0455a;p=mirror_ubuntu-kernels.git 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 --- bdeeab62a611f1f7cd48fd285ce568e8dcd0455a