Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the jc_docs tree with the mips tree
@ 2019-08-12  1:40 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-08-12  1:40 UTC (permalink / raw)
  To: Jonathan Corbet, Ralf Baechle, James Hogan
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Paul Cercueil, Paul Burton, Mauro Carvalho Chehab

[-- 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 --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-12  1:40 linux-next: manual merge of the jc_docs tree with the mips tree Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org linux-next@archiver.kernel.org
	public-inbox-index linux-next


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/ public-inbox