Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Date:   Thu, 7 Dec 2023 12:08:33 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Paul Moore <paul@paul-moore.com>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Andrii Nakryiko <andrii@kernel.org>
Cc:     bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
        Casey Schaufler <casey@schaufler-ca.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the security tree with the bpf-next
 tree
Message-ID: <20231207120833.46ebfc2d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/XLz+L06gsoqiomsd0nyAVro";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/XLz+L06gsoqiomsd0nyAVro
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:

  include/linux/security.h

between commit:

  d734ca7b33db ("bpf,lsm: add BPF token LSM hooks")

from the bpf-next tree and commit:

  e1ca7129db2c ("LSM: Helpers for attribute names and filling lsm_ctx")

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 include/linux/security.h
index 00809d2d5c38,750130a7b9dd..000000000000
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@@ -32,7 -32,7 +32,8 @@@
  #include <linux/string.h>
  #include <linux/mm.h>
  #include <linux/sockptr.h>
 +#include <linux/bpf.h>
+ #include <uapi/linux/lsm.h>
 =20
  struct linux_binprm;
  struct cred;

--Sig_/XLz+L06gsoqiomsd0nyAVro
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVxGxEACgkQAVBC80lX
0Gy4Vgf+O274EwUxOtVS9S2Y1V4GBLB4rb1nfBXkGFaZcVFEb0Me3AaxcaEzpg8d
Kt4r6LSKFPfCR3vLi372ixaQSUJSYthQL8hoUNVDuCo1dVq7I2pFHfH/C/BsSFut
xww4WgQOAp2iWekkU7/5XjPQLgqDGTd1fB+4fiNTW/2rOluhVOeOsqrf+pfymLHD
7kwej6pieq63GjksZD2462AGiYkwiS7vedj2smlvYBACVCB5sZ+L1NCWMZE6nKtc
FG1/UsFpuIBvmaEGz8QlW20AFMB85SqxOnXSG/qvmfi5jINU3y32I6WEBGuGN0xT
BgO0o1aotXB2X/z9yezZPGO329pBqA==
=dqeK
-----END PGP SIGNATURE-----

--Sig_/XLz+L06gsoqiomsd0nyAVro--