Received-SPF: pass (google.com: domain of linux-kernel+bounces-21562-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Wed, 10 Jan 2024 11:13:38 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Paul Moore <paul@paul-moore.com>, 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: Re: linux-next: manual merge of the security tree with the jc_docs
 tree
Message-ID: <20240110111338.67249eec@canb.auug.org.au>
In-Reply-To: <20240105131140.7afdbbe3@canb.auug.org.au>
References: <20240105131140.7afdbbe3@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cK=ZEa_44dXS5RlX9v59Z5_";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Fri, 5 Jan 2024 13:11:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> Today's linux-next merge of the security tree got a conflict in:
>=20
>   Documentation/userspace-api/index.rst
>=20
> between commits:
>=20
>   77e075579e88 ("Documentation: move driver-api/isapnp to userspace-api/")
>   bb67bf1c4a56 ("Documentation: move driver-api/dcdbas to userspace-api/")
>=20
> from the jc_docs tree and commit:
>=20
>   f3b8788cde61 ("LSM: Identify modules by more than name")
>=20
> from the security tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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

This is now a conflict between the jc_docs tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/cK=ZEa_44dXS5RlX9v59Z5_
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWd4TIACgkQAVBC80lX
0GyDxQf6AoMv4qPgjlth4gV3j5hdvbFzUTZtPJwNEKfY2PBagTsnFRSByf0qME3/
X08zI/eOckygoFdxVsJsluXUihGU9baxVbUM8Cy4+GxQy4keSwczl5DOfiiD/Blr
f/m6a9H0jhYa/hbF5GJNzSlGC1clI9xJwTYVM+jsPlFrQAvVBCZ0KWpefMmynh0K
+HMWrpHdvsLDuIuPYYzmcZqaH9hBDcEoMQP1+yolo1XBnV1TH4iuD0XKDI5fAhw5
FJ/2MY3Gi9jEItjsTSyfzXEi0Kz5aBOli4I2Hn+xpRwKlMS49at97Mm7ZfgIgLv9
SdMRFmeC7CTQkPRhBmS/aChPh/aIYg==
=0c3m
-----END PGP SIGNATURE-----

--Sig_/cK=ZEa_44dXS5RlX9v59Z5_--