linux-next: manual merge of the vfs tree with the btrfs-kdave tree
- Date: Thu, 14 Sep 2017 10:31:10 +1000
- From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
- Subject: linux-next: manual merge of the vfs tree with the btrfs-kdave tree
Today's linux-next merge of the vfs tree got a conflict in:
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.
I fixed it up (the former removed the code updated by the latter, so I
did that) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.
[David Sterba: just wondering if all the commits that appeared in the
btrfs-kdave tree today (so late in the merge window) are really destined