Merge branch 'integration-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/fdman...

diff --cc fs/btrfs/delayed-ref.c
Simple merge

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

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

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