Received-SPF: pass (google.com: domain of linux-kernel+bounces-75843-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Thu, 22 Feb 2024 14:20:41 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>, Borislav Petkov
 <bp@alien8.de>, Tony Luck <tony.luck@intel.com>, Jonathan Corbet
 <corbet@lwn.net>
Cc: Carlos Bilbao <carlos.bilbao@amd.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Yazen Ghannam <yazen.ghannam@amd.com>
Subject: linux-next: manual merge of the edac tree with the jc_docs tree
Message-ID: <20240222142041.34342553@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/zU8aYJJPKg0ASmlJ9nmc7mR";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/zU8aYJJPKg0ASmlJ9nmc7mR
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 sect=
ion")
  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.

--=20
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
 =20
 -   staging/index
 +   Unsorted documentation <staging/index>
-    RAS/ras
 =20
 =20
  Translations

--Sig_/zU8aYJJPKg0ASmlJ9nmc7mR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXWvYkACgkQAVBC80lX
0GzlUgf+Mqrx36oqhJE2739fYlkK9j9PV6lbpYiohSqDp4Iku8wNB7YQjof67VBG
k/iK1Z4rL2K/JYS8klwlRo9yLiL3SttjKFdmTdPGHCBzCe8c5ZU4cNQWhL+ZjmqE
P+ma5rs9Xp7+QYGSSxIuCFcvEcl5ram6aTRS3cMhvxj4FC5ZoDnNleiHQnXzrLB9
4qKn1fWIIYtI/nrlkoxo4yPstIjQkjZ856il2YUge0klCdJqalESEc5CiuA2jqVf
QIh3vfvozVvFl1o5A5AAmY4OlMEmHaH97U6sl9cR+KUwnfivpD1obRbYl7eRgWvT
//fOQo3ZPfmpBNMNU3OQOHSqZAcBRg==
=VrXX
-----END PGP SIGNATURE-----

--Sig_/zU8aYJJPKg0ASmlJ9nmc7mR--