linux-next: manual merge of the vfs tree with the btrfs-kdave tree

2018-08-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the vfs tree got conflicts in: fs/btrfs/inode.c fs/btrfs/tree-log.c Commits 8e5d411c91c1 ("btrfs: simplify btrfs_iget()") cfac83868124 ("btrfs: lift make_bad_inode() into btrfs_iget()") efa119590db3 ("btrfs: IS_ERR(p) && PTR_ERR(p) == n is a weird w

linux-next: manual merge of the vfs tree with the btrfs-kdave tree

2017-11-08 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the vfs tree got a conflict in: fs/btrfs/super.c between commit: c2a6acf1b800 ("btrfs: cleanup btrfs_mount() using mount_root()") from the btrfs-kdave tree and commit: c2c6773f9942 ("VFS: Roll out mount flag differentiation (MS_* -> SB_*) generally")

linux-next: manual merge of the vfs tree with the btrfs-kdave tree

2017-09-13 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the vfs tree got a conflict in: fs/btrfs/root-tree.c between commit: 8b591d54b74b ("btrfs: Clean up dead code in root-tree") from the btrfs-kdave tree and commit: bc98a42c1f7d ("VFS: Convert sb->s_flags & MS_RDONLY to sb_rdonly(sb)") from the vfs tree