Re: linux-next: manual merge of the selinux tree with Linus' tree

[Paul Moore]

On Mon, Sep 20, 2021 at 9:17 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the selinux tree got a conflict in:
>
>   fs/io-wq.c
>
> between commit:
>
>   dd47c104533d ("io-wq: provide IO_WQ_* constants for IORING_REGISTER_IOWQ_MAX_WORKERS arg items")
>
> from Linus' tree and commit:
>
>   5bd2182d58e9 ("audit,io_uring,io-wq: add some basic audit support to io_uring")
>
> from the selinux tree.

Thanks Stephen.

I noticed the same thing while doing some additional testing yesterday
and applied a very similar patch to my testing kernel.  I'll be sure
to mention this to Linus when I send this up during the next merge
window.

-- 
paul moore
www.paul-moore.com