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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAHC9VhTFp6uj+bBhiEhvd2v346qOLx-t0bs=mv==8rCY5Zq+jg@mail.gmail.com>
Date:   Tue, 21 Sep 2021 10:43:04 -0400
From:   Paul Moore <paul@...l-moore.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Eugene Syromiatnikov <esyr@...hat.com>,
        Jens Axboe <axboe@...nel.dk>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the selinux tree with Linus' tree

On Mon, Sep 20, 2021 at 9:17 PM Stephen Rothwell <sfr@...b.auug.org.au> 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