linux-next: manual merge of the overlayfs tree with the ext4 tree
From: Stephen Rothwell
Date: Wed Mar 23 2016 - 19:52:01 EST
Today's linux-next merge of the overlayfs tree got a conflict in:
a7f7fb45f728 ("vfs: add file_dentry()")
from the ext4 tree and commit:
83c2715a73fc ("fs: add file_dentry()")
from the overlayfs tree.
This looks like 2 incompatible versions of the same patch committed to
2 different trees :-( Guys you can't work like this.
Either the patch set was not ready and Ted should not have applied it,
or the new version should not have been added to the overlayfs tree
(especially now, during the merge window). If it was meant to be applied
to more than one tree, it should have been put in a non-rebaing separate
branch that could be merged by each tree.
I fixed it up (I dropped the overlayfs tree for today) 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.