Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Mon, 11 Dec 2023 12:29:17 +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>,
        Sumit Garg <sumit.garg@linaro.org>
Subject: linux-next: manual merge of the security tree with the jc_docs tree
Message-ID: <20231211122917.138d141b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/VHdyE0Ee2I.oPd+91Q7uGKY";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/VHdyE0Ee2I.oPd+91Q7uGKY
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 commit:

  50709576d81b ("Documentation: Destage TEE subsystem documentation")

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

--Sig_/VHdyE0Ee2I.oPd+91Q7uGKY
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV2Ze0ACgkQAVBC80lX
0Gx4iwf/TWC7G21TDZQHjthHM9Xjt5Kq8T4vggBhw+gFwjgG34ErZQdCO/kAqGzZ
kfrbeammVxfVeWJ61O1/D3ZAhJD8ZKv4YvHx3suX87ymOxeLtD+u2IOmSIku4rgu
hdj1l7rqEJAZ+IKcSsbwVSDwzl1lofvdObi4DEBRZ1xAek6iA7a0vIGdeYr+ChPM
gm1JqZGDnTOsTR9BXlu7arO3jCCwI1tRHR8eDf0d+8gUSWl96i1gkh0GzethA0kq
OpTWqwCnMre5d6Y/UMLP3zzT+VbN+wmHyDdrt2h+aiiN6szxzU94ZoYwh5OtTVaQ
rF4jJp1KDSOALJlyyMf+QMHAeA6LcQ==
=8jcW
-----END PGP SIGNATURE-----

--Sig_/VHdyE0Ee2I.oPd+91Q7uGKY--