From: Linus Torvalds Date: Sun, 13 Mar 2011 23:00:49 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~14983 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0e5b88cd9975dca6c191cc9bd11f233fac4ca882;p=linux-4.9.git Merge git://git./linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: break out of shrink_delalloc earlier btrfs: fix not enough reserved space btrfs: fix dip leak Btrfs: make sure not to return overlapping extents to fiemap Btrfs: deal with short returns from copy_from_user Btrfs: fix regressions in copy_from_user handling --- 0e5b88cd9975dca6c191cc9bd11f233fac4ca882