From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>,
Ralf Baechle <ralf@linux-mips.org>,
James Hogan <jhogan@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Paul Cercueil <paul@crapouillou.net>,
Paul Burton <paul.burton@mips.com>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Subject: linux-next: manual merge of the jc_docs tree with the mips tree
Date: Mon, 12 Aug 2019 11:40:50 +1000 [thread overview]
Message-ID: <20190812114050.0c94ad6e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/mips/index.rst
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.
--
Cheers,
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-08-12 1:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190812114050.0c94ad6e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=corbet@lwn.net \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=paul.burton@mips.com \
--cc=paul@crapouillou.net \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).