From: Linus Torvalds Date: Tue, 20 Sep 2011 00:17:32 +0000 (-0700) Subject: Merge branch 'for-linus' of git://github.com/chrismason/linux X-Git-Tag: firefly_0821_release~3680^2~4442 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=50f2d407c09be74c77cf9d502d087398a5ba6055;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://github.com/chrismason/linux * 'for-linus' of git://github.com/chrismason/linux: Btrfs: only clear the need lookup flag after the dentry is setup BTRFS: Fix lseek return value for error Btrfs: don't change inode flag of the dest clone file Btrfs: don't make a file partly checksummed through file clone Btrfs: fix pages truncation in btrfs_ioctl_clone() btrfs: fix d_off in the first dirent --- 50f2d407c09be74c77cf9d502d087398a5ba6055