From: Paul Moore <paul@paul-moore.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eugene Syromiatnikov <esyr@redhat.com>,
Jens Axboe <axboe@kernel.dk>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the selinux tree with Linus' tree
Date: Tue, 21 Sep 2021 10:43:04 -0400 [thread overview]
Message-ID: <CAHC9VhTFp6uj+bBhiEhvd2v346qOLx-t0bs=mv==8rCY5Zq+jg@mail.gmail.com> (raw)
In-Reply-To: <20210921111750.6f7bd218@canb.auug.org.au>
On Mon, Sep 20, 2021 at 9:17 PM Stephen Rothwell <sfr@canb.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
next prev parent reply other threads:[~2021-09-21 14:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 1:17 linux-next: manual merge of the selinux tree with Linus' tree Stephen Rothwell
2021-09-21 14:43 ` Paul Moore [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-05 0:52 Stephen Rothwell
2023-06-05 20:47 ` Paul Moore
2022-11-10 1:44 Stephen Rothwell
2022-11-10 2:26 ` Paul Moore
2020-02-12 22:48 Stephen Rothwell
2020-02-12 23:03 ` Paul Moore
2017-05-22 2:38 Stephen Rothwell
2017-05-22 21:08 ` Paul Moore
2017-05-22 21:13 ` Daniel Jurgens
2013-07-26 3:48 Stephen Rothwell
2013-07-26 4:22 ` David Quigley
2013-07-26 7:38 ` Stephen Rothwell
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='CAHC9VhTFp6uj+bBhiEhvd2v346qOLx-t0bs=mv==8rCY5Zq+jg@mail.gmail.com' \
--to=paul@paul-moore.com \
--cc=axboe@kernel.dk \
--cc=esyr@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).