Received-SPF: pass (google.com: domain of linux-kernel+bounces-17407-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Fri, 5 Jan 2024 13:11:40 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>, Jonathan Corbet <corbet@lwn.net>
Cc: Casey Schaufler <casey@schaufler-ca.com>, Kees Cook
 <keescook@chromium.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Vegard Nossum <vegard.nossum@oracle.com>
Subject: linux-next: manual merge of the security tree with the jc_docs tree
Message-ID: <20240105131140.7afdbbe3@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/w=_xNN+Bd06jW.HsLm/wN.A";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/w=_xNN+Bd06jW.HsLm/wN.A
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/userspace-api/index.rst

between commits:

  77e075579e88 ("Documentation: move driver-api/isapnp to userspace-api/")
  bb67bf1c4a56 ("Documentation: move driver-api/dcdbas to userspace-api/")

from the jc_docs tree and commit:

  f3b8788cde61 ("LSM: Identify modules by more than name")

from the security 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/userspace-api/index.rst
index 74bc0716432e,8be8b1979194..000000000000
--- a/Documentation/userspace-api/index.rst
+++ b/Documentation/userspace-api/index.rst
@@@ -30,9 -33,7 +30,10 @@@ place where this information is gathere
     sysfs-platform_profile
     vduse
     futex2
 +   tee
 +   isapnp
 +   dcdbas
+    lsm
 =20
  .. only::  subproject and html
 =20

--Sig_/w=_xNN+Bd06jW.HsLm/wN.A
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWXZV0ACgkQAVBC80lX
0GzJUAf9HmWLD88EC+YlGuWOM5s1g5Gr044Vk76+rr5OXJ4k+exYa2VvtOHe8FWK
Gyh5ajnoqiqVxU1mcqhrLq7T4YD9NBja4C/dq8vVMr2KxOhh8NW4ByBFpT05pUaY
RlVUStaS7Bozz/b84+NK4FIZZ7zLbjwloQ9V6qgV+emeZ55hYQC9bTA5sX8WyEKm
EStn55pigJa05mhQBn6ZtC6SkeYOkDIBU6m9q7OMymqTQrFoBY2QXBYjsz1DK+lR
V3kRxOZTVsUYo67kRatgJ4FbdqBA5Wneph3zvGFwPuUtbnO1AdceaqKaJDumWgQT
u+NlyOu25eKPkW4wWRc4Oeslrje3rg==
=a/kJ
-----END PGP SIGNATURE-----

--Sig_/w=_xNN+Bd06jW.HsLm/wN.A--