linux-next: manual merge of the audit tree with the device-mapper, selinux trees

[Stephen Rothwell]

Hi all,

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

  include/uapi/linux/audit.h

between commits:

  c1d7fa96e74b ("dm: introduce audit event module for device mapper")
  5bd2182d58e9 ("audit,io_uring,io-wq: add some basic audit support to io_uring")

from the device-mapper, selinux trees 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/uapi/linux/audit.h
index bf3214530439,afa2472ad5d6..000000000000
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@@ -118,9 -118,7 +118,10 @@@
  #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_OPENAT2		1337	/* Record showing openat2 how args */
 +#define AUDIT_DM_CTRL		1336	/* Device Mapper target control */
 +#define AUDIT_DM_EVENT		1337	/* Device Mapper events */
 +#define AUDIT_URINGOP		1338	/* io_uring operation */
++#define AUDIT_OPENAT2		1339	/* Record showing openat2 how args */
  
  #define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
  #define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */

Attachment: pgpx5hsDWdN0m.pgp
Description: OpenPGP digital signature