linux-next: manual merge of the audit tree with the vfs-brauner tree

[Mark Brown]

Hi all,

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

  include/linux/audit.h

between commit:

  125dfa218134d ("audit: widen ino fields to u64")

from the vfs-brauner tree and commit:

  360160f75592b ("audit: handle unknown status requests in audit_receive_msg()")

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.

diff --cc include/linux/audit.h
index b915aaa7ed739,d79218bf075a0..0000000000000
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@@ -15,7 -15,16 +15,16 @@@
  #include <uapi/linux/audit.h>
  #include <uapi/linux/fanotify.h>
  
+ #define AUDIT_STATUS_ALL (AUDIT_STATUS_ENABLED | \
+ 			  AUDIT_STATUS_FAILURE | \
+ 			  AUDIT_STATUS_PID | \
+ 			  AUDIT_STATUS_RATE_LIMIT | \
+ 			  AUDIT_STATUS_BACKLOG_LIMIT | \
+ 			  AUDIT_STATUS_BACKLOG_WAIT_TIME | \
+ 			  AUDIT_STATUS_LOST | \
+ 			  AUDIT_STATUS_BACKLOG_WAIT_TIME_ACTUAL)
+ 
 -#define AUDIT_INO_UNSET ((unsigned long)-1)
 +#define AUDIT_INO_UNSET ((u64)-1)
  #define AUDIT_DEV_UNSET ((dev_t)-1)
  
  struct audit_sig_info {

Attachment: signature.asc
Description: PGP signature