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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 7 Aug 2015 14:15:41 +1000

Hi Paul,

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

  kernel/audit.c

between commit:

  5985de6754a6 ("audit: code clean up")

from Linus' tree and commit:

  84cb777e6781 ("audit: use macros for unset inode and device values")

from the audit tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc kernel/audit.c
index f9e6065346db,060153dc47d4..000000000000
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@@ -1761,7 -1759,7 +1761,7 @@@ void audit_log_name(struct audit_contex
  	} else
  		audit_log_format(ab, " name=(null)");
  
- 	if (n->ino != (unsigned long)-1)
 -	if (n->ino != AUDIT_INO_UNSET) {
++	if (n->ino != AUDIT_INO_UNSET)
  		audit_log_format(ab, " inode=%lu"
  				 " dev=%02x:%02x mode=%#ho"
  				 " ouid=%u ogid=%u rdev=%02x:%02x",