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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2031 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/auditsc.c between commit b24a30a73054 ("audit: fix event coverage
of AUDIT_ANOM_LINK") from Linus' tree and commit "audit: fix mq_open and
mq_unlink to add the MQ root as a hidden parent audit_names record" from
the akpm tree.

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

BTW, commit b24a30a73054 from Linus' tree has Eric Paris as Author and
Committer, but is only Signed-off-by Kees Cook.  It is part of a long
series that did not go anywhere near linus-next.   I do have an audit
tree in linux-next
(git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next)
but that hasn't seen any recent activity.

There is also another commit in that series that doesn't even have a
Signed-off-by line at all (4d3fb709b285 "helper for some session id
stuff").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/auditsc.c
index 3c8a601,f9eaa16..0000000
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@@ -1399,8 -1695,11 +1399,11 @@@ static void audit_log_exit(struct audit
  	}
  
  	i = 0;
- 	list_for_each_entry(n, &context->names_list, list)
+ 	list_for_each_entry(n, &context->names_list, list) {
+ 		if (n->hidden)
+ 			continue;
 -		audit_log_name(context, n, i++, &call_panic);
 +		audit_log_name(context, n, NULL, i++, &call_panic);
+ 	}
  
  	/* Send end of event record to help user space know we are finished */
  	ab = audit_log_start(context, GFP_KERNEL, AUDIT_EOE);
diff --git a/kernel/audit.h b/kernel/audit.h
index 1c95131..52dfbfc 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -97,6 +97,7 @@ struct audit_names {
 	struct audit_cap_data	fcap;
 	unsigned int		fcap_ver;
 	unsigned char		type;		/* record type */
+	bool			hidden;		/* don't log this record */
 	/*
 	 * This was an allocated audit_names and not from the array of
 	 * names allocated in the task audit context.  Thus this name

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]