Merge branch 'cleanup/messages' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

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

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

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