Hi Jonathan,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/gpu/index.rst
between commit:
b754b35b089d ("vgaarbiter: rst-ifiy and polish kerneldoc")
from the drm-misc tree and commit:
505f711174b0 ("doc-rst: add index to sub-folders")
from the jc_docs 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/gpu/index.rst
index ba92f45abb76,5ff3d2b236af..000000000000
--- a/Documentation/gpu/index.rst
+++ b/Documentation/gpu/index.rst
@@@ -12,4 -12,10 +12,11 @@@ Linux GPU Driver Developer's Guid
drm-uapi
i915
vga-switcheroo
+ vgaarbiter
+
+ .. only:: subproject
+
+ Indices
+ =======
+
+ * :ref:`genindex`
--
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
