Received-SPF: pass (google.com: domain of linux-kernel+bounces-21710-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Wed, 10 Jan 2024 15:49:59 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
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>, Pavel Begunkov <asml.silence@gmail.com>
Subject: Re: linux-next: manual merge of the security tree with the block
 tree
Message-ID: <20240110154959.77a213e3@canb.auug.org.au>
In-Reply-To: <20231204120314.5718b5f6@canb.auug.org.au>
References: <20231204120314.5718b5f6@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/MrBfATJrWuRNk8vHIsgNGWb";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Mon, 4 Dec 2023 12:03:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> Today's linux-next merge of the security tree got conflicts in:
>=20
>   security/selinux/hooks.c
>   security/smack/smack_lsm.c
>=20
> between commit:
>=20
>   bf18dde00aa9 ("io_uring: split out cmd api into a separate header")
>=20
> from the block 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 security/selinux/hooks.c
> index 17ec5e109aec,b340425ccfae..000000000000
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@@ -91,7 -91,8 +91,8 @@@
>   #include <uapi/linux/mount.h>
>   #include <linux/fsnotify.h>
>   #include <linux/fanotify.h>
>  -#include <linux/io_uring.h>
>  +#include <linux/io_uring/cmd.h>
> + #include <uapi/linux/lsm.h>
>  =20
>   #include "avc.h"
>   #include "objsec.h"
> diff --cc security/smack/smack_lsm.c
> index 2cdaa46088a0,53336d7daa93..000000000000
> --- a/security/smack/smack_lsm.c
> +++ b/security/smack/smack_lsm.c
> @@@ -42,7 -42,8 +42,8 @@@
>   #include <linux/fs_context.h>
>   #include <linux/fs_parser.h>
>   #include <linux/watch_queue.h>
>  -#include <linux/io_uring.h>
>  +#include <linux/io_uring/cmd.h>
> + #include <uapi/linux/lsm.h>
>   #include "smack.h"
>  =20
>   #define TRANS_TRUE	"TRUE"

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

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWeIfcACgkQAVBC80lX
0GwTugf+JwgcOvZOQ4Yek+gvDwBKgVjbg5YIHMDW0CoVvu3yMJT1Bb+7p/9Yx5cA
I31lfoHPNF9QWZ4anEgndTZv8HbH4RUiI5Ym4rXIy8K1xrstjmshJJIoxLM37XK6
eWUaU3jt4CHpglr0FzkBAb9y+qx8axtEwmmnIZYEaiz+I/Q49JIIen5dtneaqxjM
GjPcWZGPk6heoIDXf+2vXHaCPLWJ/X3qg6EVaC9kD80wRTbGWZAkXfv28LL3S9tm
vCrQ4GT/XRhtUKAUYSmAWVv0HFxfFI91cf1qDooRBP11vr9oI6KkBMB3fq7YV/7d
OSvXGCdzglqY//zap+GHAdgcNPHK3A==
=p9vR
-----END PGP SIGNATURE-----

--Sig_/MrBfATJrWuRNk8vHIsgNGWb--