linux-kernel - linux-next: manual merge of the edac tree with 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240222142041.34342553@canb.auug.org.au>
Date: Thu, 22 Feb 2024 14:20:41 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mauro Carvalho Chehab <mchehab+samsung@...nel.org>, Borislav Petkov
 <bp@...en8.de>, Tony Luck <tony.luck@...el.com>, Jonathan Corbet
 <corbet@....net>
Cc: Carlos Bilbao <carlos.bilbao@....com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Yazen Ghannam <yazen.ghannam@....com>
Subject: linux-next: manual merge of the edac tree with the jc_docs tree

Hi all,

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

  Documentation/index.rst

between commit:

  9ee367809c67 ("docs: Include simplified link titles in main index")

from the jc_docs tree and commits:

  1289c431641f ("Documentation: RAS: Add index and address translation section")
  0e4fd816b08e ("Documentation: Move RAS section to admin-guide")

from the edac 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 429a407470c8,9dfdc826618c..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -112,8 -112,7 +112,7 @@@ to ReStructured Text format, or are sim
  .. toctree::
     :maxdepth: 1
  
 -   staging/index
 +   Unsorted documentation <staging/index>
-    RAS/ras
  
  
  Translations

Content of type "application/pgp-signature" skipped