Merge branch 'for-chris-4.11-part2' of git://git.kernel.org/pub/scm/linux/kernel...

diff --cc fs/btrfs/ctree.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/file-item.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/tree-log.c
Simple merge