Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git...

Signed-off-by: Chris Mason <clm@fb.com>

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

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

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

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

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

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

diff --cc fs/btrfs/free-space-cache.c
Simple merge

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

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

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

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

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

diff --cc fs/btrfs/tests/extent-io-tests.c
index 71ab575e7633e6e98966a268cb822f1dbccc6a73,6ec2bce015dc1f91fa20dbabc18fd61b974ac4d1..e29fa297e053951a2d2d178a8793c9d49e021023
--- 1/fs/btrfs/tests/extent-io-tests.c
--- 2/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@@ -18,7 -18,7 +18,8 @@@
  
  #include <linux/pagemap.h>
  #include <linux/sched.h>
 +#include <linux/slab.h>
+ #include <linux/sizes.h>
  #include "btrfs-tests.h"
  #include "../extent_io.h"
  

diff --cc fs/btrfs/tests/free-space-tests.c
Simple merge

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

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

diff --cc fs/btrfs/volumes.h
Simple merge