Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in:
Documentation/dev-tools/index.rst
between commit:
7fb2e8a49037 ("docs-rst: convert kgdb DocBook to ReST")
from the jc_docs tree and commit:
5714b6531b49 ("Documentation/dev-tools: Use reStructuredText markups for
kselftest")
from the kselftest tree.
I fixed it up (see below) 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
diff --cc Documentation/dev-tools/index.rst
index 4ac991dbddb7,e50054c6aeaa..000000000000
--- a/Documentation/dev-tools/index.rst
+++ b/Documentation/dev-tools/index.rst
@@@ -23,7 -23,7 +23,8 @@@ whole; patches welcome
kmemleak
kmemcheck
gdb-kernel-debugging
+ kgdb
+ kselftest
.. only:: subproject and html
