From: Eric Paris <eparis@redhat.com>
Date: Fri, 7 Mar 2014 16:41:32 +0000 (-0500)
Subject: Merge tag 'v3.13' into for-3.15
X-Git-Tag: v3.15-rc1~18^2~28
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=b7d3622a39fde7658170b7f3cf6c6889bb8db30d

Merge tag 'v3.13' into for-3.15

Linux 3.13

Conflicts:
	include/net/xfrm.h

Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.
---

b7d3622a39fde7658170b7f3cf6c6889bb8db30d
diff --cc include/net/xfrm.h
index f8d32b908423,6b82fdf4ba71..1d535f4d3873
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@@ -713,23 -715,23 +715,23 @@@ static inline void xfrm_audit_helper_us
  		audit_log_task_context(audit_buf);
  }
  
- extern void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
- 				  kuid_t auid, unsigned int ses, u32 secid);
- extern void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,
- 				  kuid_t auid, unsigned int ses, u32 secid);
- extern void xfrm_audit_state_add(struct xfrm_state *x, int result,
- 				 kuid_t auid, unsigned int ses, u32 secid);
- extern void xfrm_audit_state_delete(struct xfrm_state *x, int result,
- 				    kuid_t auid, unsigned int ses, u32 secid);
- extern void xfrm_audit_state_replay_overflow(struct xfrm_state *x,
- 					     struct sk_buff *skb);
- extern void xfrm_audit_state_replay(struct xfrm_state *x,
- 				    struct sk_buff *skb, __be32 net_seq);
- extern void xfrm_audit_state_notfound_simple(struct sk_buff *skb, u16 family);
- extern void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family,
- 				      __be32 net_spi, __be32 net_seq);
- extern void xfrm_audit_state_icvfail(struct xfrm_state *x,
- 				     struct sk_buff *skb, u8 proto);
+ void xfrm_audit_policy_add(struct xfrm_policy *xp, int result, kuid_t auid,
 -			   u32 ses, u32 secid);
++			   unsigned int ses, u32 secid);
+ void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result, kuid_t auid,
 -			      u32 ses, u32 secid);
++			      unsigned int ses, u32 secid);
+ void xfrm_audit_state_add(struct xfrm_state *x, int result, kuid_t auid,
 -			  u32 ses, u32 secid);
++			  unsigned int ses, u32 secid);
+ void xfrm_audit_state_delete(struct xfrm_state *x, int result, kuid_t auid,
 -			     u32 ses, u32 secid);
++			     unsigned int ses, u32 secid);
+ void xfrm_audit_state_replay_overflow(struct xfrm_state *x,
+ 				      struct sk_buff *skb);
+ void xfrm_audit_state_replay(struct xfrm_state *x, struct sk_buff *skb,
+ 			     __be32 net_seq);
+ void xfrm_audit_state_notfound_simple(struct sk_buff *skb, u16 family);
+ void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family, __be32 net_spi,
+ 			       __be32 net_seq);
+ void xfrm_audit_state_icvfail(struct xfrm_state *x, struct sk_buff *skb,
+ 			      u8 proto);
  #else
  
  static inline void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,