linux-next: manual merge of the vfs tree with the overlayfs tree
From: Stephen Rothwell
Date: Sun Dec 11 2016 - 18:14:06 EST
Today's linux-next merge of the vfs tree got a conflict in:
659f95a46dd0 ("ovl: add ovl_dentry_is_whiteout()")
ee2e4303d554 ("ovl: opaque cleanup")
f7cd4e7b2743 ("ovl: clean up kstat usage")
from the overlayfs tree and commit:
718324db4435 ("overlayfs: stop abusing kstat")
from the vfs tree.
It looks like commits f7cd4e7b2743 and 718324db4435 are essentially the
smae change (with some white space differences).
I fixed it up (I just took bits from each of teh above) 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.
Miklos, that overlayfs tree commit f7cd4e7b2743 has no Signed-off-by
from Al as its Author :-(