Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  lib/Kconfig.debug

between commit:

  63d0977c0e85 ("lib/Kconfig.debug: correct documentation paths")

from the jc_docs tree and commit:

  2c81218d9f29 ("Kconfig: lib/Kconfig.debug: fix references to Documenation")

from the akpm-current tree.

I fixed it up (I just used the version from the jc_docs tree) 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