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.

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/init_task.h
Simple merge

diff --cc include/net/xfrm.h
index f8d32b908423f5fa595694eeef778d70f17517d6,6b82fdf4ba716898ea53fb0cf2e66690a66d1479..1d535f4d3873a67a811174f0d4df34494da250e8
--- 1/include/net/xfrm.h
--- 2/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,

diff --cc include/uapi/linux/audit.h
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge

diff --cc security/selinux/ss/services.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge