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

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

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

diff --cc fs/btrfs/dev-replace.c
index 1f193f7,3371f9e..85f12e6
--- 1/fs/btrfs/dev-replace.c
--- 2/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@@ -383,9 -401,9 +383,9 @@@ int btrfs_dev_replace_start(struct btrf
  
        ret = btrfs_sysfs_add_device_link(tgt_device->fs_devices, tgt_device);
        if (ret)
 -              btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret);
 +              btrfs_err(fs_info, "kobj add dev failed %d\n", ret);
  
-       btrfs_wait_ordered_roots(fs_info, -1);
+       btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1);
  
        /* force writing the updated state information to disk */
        trans = btrfs_start_transaction(root, 0);

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

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

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

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

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

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

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