From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>
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: linux-next: manual merge of the selinux tree with Linus' tree
Date: Tue, 21 Sep 2021 11:17:50 +1000 [thread overview]
Message-ID: <20210921111750.6f7bd218@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
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.
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 fs/io-wq.c
index b5fd015268d7,dac5c5961c9d..000000000000
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@@ -14,7 -14,7 +14,8 @@@
#include <linux/rculist_nulls.h>
#include <linux/cpu.h>
#include <linux/tracehook.h>
+ #include <linux/audit.h>
+#include <uapi/linux/io_uring.h>
#include "io-wq.h"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-09-21 1:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 1:17 Stephen Rothwell [this message]
2021-09-21 14:43 ` linux-next: manual merge of the selinux tree with Linus' tree Paul Moore
-- 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=20210921111750.6f7bd218@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=esyr@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul@paul-moore.com \
/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).