linux-kernel - linux-next: manual merge of the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190812114050.0c94ad6e@canb.auug.org.au>
Date:   Mon, 12 Aug 2019 11:40:50 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>,
        Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <jhogan@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Paul Cercueil <paul@...pouillou.net>,
        Paul Burton <paul.burton@...s.com>,
        Mauro Carvalho Chehab <mchehab+samsung@...nel.org>
Subject: linux-next: manual merge of the jc_docs tree with the mips tree

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`

Content of type "application/pgp-signature" skipped