Skip to contentSkip to conversation

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

DISCUSSION Stephen Rothwell 2 participants 2 messages Sep 21, 2021 Linux-next tree

lore
Share & tools
lore
#0 lore raw

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.

Signature · 15 lines
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"
#1 lore raw
Quoted 9 lines · Stephen Rothwell

Hi all,

Today's linux-next merge of the selinux tree got a conflict in:

fs/io-wq.c

between commit:

Quoted 7 lines

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.

Signature · 2 lines
paul moore
www.paul-moore.com