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
Date: Wed, 10 Jan 2024 15:49:59 +1100 [thread overview]
Message-ID: <20240110154959.77a213e3@canb.auug.org.au> (raw)
In-Reply-To: <20231204120314.5718b5f6@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1903 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2024-01-10 4:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 1:03 linux-next: manual merge of the security tree with the block tree Stephen Rothwell
2023-12-04 16:37 ` Paul Moore
2024-01-10 4:49 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240110154959.77a213e3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=asml.silence@gmail$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=casey@schaufler-ca$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul@paul-moore$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox