Skip to contentSkip to conversation

linux-next: manual merge of the audit tree with the selinux tree

DISCUSSION Stephen Rothwell 2 participants 2 messages Oct 5, 2021 Linux-next tree

lore
Share & tools
lore

Stephen Rothwell

author
#0 lore raw

Hi all,

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

include/uapi/linux/audit.h

between commit:

5bd2182d58e9 ("audit,io_uring,io-wq: add some basic audit support to io_uring")

from the selinux tree and commit:

571e5c0efcb2 ("audit: add OPENAT2 record to list "how" info")

from the audit 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 · 16 lines
Cheers,
Stephen Rothwell

diff --cc include/uapi/linux/audit.h
index ecf1edd2affa,afa2472ad5d6..000000000000
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@@ -118,7 -118,7 +118,8 @@@
  #define AUDIT_TIME_ADJNTPVAL	1333	/* NTP value adjustment */
  #define AUDIT_BPF		1334	/* BPF subsystem */
  #define AUDIT_EVENT_LISTENER	1335	/* Task joined multicast read socket */
 +#define AUDIT_URINGOP		1336	/* io_uring operation */
+ #define AUDIT_OPENAT2		1337	/* Record showing openat2 how args */
  
  #define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
  #define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */
#1 lore raw
Quoted 9 lines · Stephen Rothwell

Hi all,

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

include/uapi/linux/audit.h

between commit:

Quoted 7 lines

5bd2182d58e9 ("audit,io_uring,io-wq: add some basic audit support to io_uring")

from the selinux tree and commit:

571e5c0efcb2 ("audit: add OPENAT2 record to list "how" info")

from the audit tree.

Thanks Stephen, your fix below is correct and I'll make sure to mention this to Linus when sending the SELinux and audit trees to him during the next merge window.

Quoted 13 lines
include/uapi/linux/audit.h +1 -0
diff --cc include/uapi/linux/audit.h
index ecf1edd2affa,afa2472ad5d6..000000000000
@@@ -118,7 -118,7 +118,8 @@@
  #define AUDIT_TIME_ADJNTPVAL  1333    /* NTP value adjustment */
  #define AUDIT_BPF             1334    /* BPF subsystem */
  #define AUDIT_EVENT_LISTENER  1335    /* Task joined multicast read socket */
 +#define AUDIT_URINGOP         1336    /* io_uring operation */
+ #define AUDIT_OPENAT2         1337    /* Record showing openat2 how args */
 
  #define AUDIT_AVC             1400    /* SE Linux avc denial or grant */
  #define AUDIT_SELINUX_ERR     1401    /* Internal SE Linux Errors */
Signature · 2 lines
paul moore
www.paul-moore.com