From: Linus Torvalds Date: Fri, 12 Feb 2016 17:21:28 +0000 (-0800) Subject: Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... X-Git-Tag: v5.15~14231 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=27c9d772e50731dfd682b4ea9459eccec2071c49;p=mirror_ubuntu-kernels.git Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "This has a few fixes from Filipe, along with a readdir fix from Dave that we've been testing for some time" * 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: properly set the termination value of ctx->pos in readdir Btrfs: fix hang on extent buffer lock caused by the inode_paths ioctl Btrfs: remove no longer used function extent_read_full_page_nolock() Btrfs: fix page reading in extent_same ioctl leading to csum errors Btrfs: fix invalid page accesses in extent_same (dedup) ioctl --- 27c9d772e50731dfd682b4ea9459eccec2071c49