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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 20 Jan 2015 15:04:19 +1100

Hi Paul,

Today's linux-next merge of the audit tree got a conflict in
include/linux/audit.h between commit 041d7b98ffe5 ("audit: restore
AUDIT_LOGINUID unset ABI") from Linus' tree and commit e80da768eae4
("audit: remove vestiges of vers_ops") 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 include/linux/audit.h
index af84234e1f6e,26710c5b9443..000000000000
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@@ -46,8 -46,6 +46,7 @@@ struct audit_tree
  struct sk_buff;
  
  struct audit_krule {
- 	int			vers_ops;
 +	u32			pflags;
  	u32			flags;
  	u32			listnr;
  	u32			action;