linux-kernel - linux-next: manual merge of the mips tree with Linus' tree

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]

Date:   Mon, 12 Aug 2019 09:19:15 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     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 mips tree with Linus' tree

Hi all,

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

  Documentation/index.rst

between commit:

  08a69058c02f ("docs: power: add it to to the main documentation index")

from Linus' tree and commit:

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

from the mips 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/index.rst
index 2df5a3da563c,87214feda41f..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -145,7 -143,7 +145,8 @@@ implementation
     arm64/index
     ia64/index
     m68k/index
+    mips/index
 +   powerpc/index
     riscv/index
     s390/index
     sh/index

Content of type "application/pgp-signature" skipped