Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/overlayfs/super.c
between commit:
420598d5bf9c ("ovl: ignore permissions on underlying lookup")
from the overlayfs tree and commit:
b9e1d435fdf4 ("ovl_lookup_real(): use lookup_one_len_unlocked()")
from the vfs tree.
I fixed it up (I abitrarily chose the overlayfs version (using
lookup_hash() instead of lookup_one_len_unlocked())) 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.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
