linux-next: manual merge of the jc_docs tree with the mips tree

From: Stephen Rothwell
Date: Sun Aug 11 2019 - 21:40:59 EST

Hi all,

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


between commit:

97689a1a3fda ("doc: Add doc for the Ingenic TCU hardware")

from the mips tree and commit:

80b1505893b6 ("docs: mips: add to the documentation body as ReST")

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.

Stephen Rothwell

diff --cc Documentation/mips/index.rst
index 321b4794f3b8,fd9023c8a89f..000000000000
--- a/Documentation/mips/index.rst
+++ b/Documentation/mips/index.rst
@@@ -1,11 -1,17 +1,19 @@@
.. SPDX-License-Identifier: GPL-2.0

-MIPS architecture
+MIPS-specific Documentation

.. toctree::
- :maxdepth: 1
+ :maxdepth: 2
+ :numbered:

+ au1xxx_ide
+ ingenic-tcu
+ .. only:: subproject and html
+ Indices
+ =======
+ * :ref:`genindex`

Attachment: pgpWi_oEVjFPy.pgp
Description: OpenPGP digital signature