Messages in this thread | ![/](/images/icornerl.gif) | | Date | Wed, 10 Jan 2024 15:49:59 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the security tree with the block tree |
| |
Hi all,
On Mon, 4 Dec 2023 12:03:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the security tree got conflicts in: > > security/selinux/hooks.c > security/smack/smack_lsm.c > > between commit: > > bf18dde00aa9 ("io_uring: split out cmd api into a separate header") > > from the block 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. > > -- > Cheers, > Stephen Rothwell > > 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> > > #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" > > #define TRANS_TRUE "TRUE"
This is now a conflict between the block tree and Linus' tree.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | ![\](/images/icornerr.gif) |