Merge remote-tracking branch 'security/next'

Conflicts:
	include/linux/filter.h

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/filter.h
index 72090994d789c235c7f73545cec3bc136ff57600,f2e53152e835c91dab568cac58b69fcf2c555851..82b01357af8b0672c330c648f3b01f5aa65134d2
--- 1/include/linux/filter.h
--- 2/include/linux/filter.h
+++ b/include/linux/filter.h
@@@ -232,7 -239,7 +243,8 @@@ enum 
        BPF_S_ANC_HATYPE,
        BPF_S_ANC_RXHASH,
        BPF_S_ANC_CPU,
 +      BPF_S_ANC_ALU_XOR_X,
+       BPF_S_ANC_SECCOMP_LD_W,
  };
  
  #endif /* __KERNEL__ */

diff --cc include/linux/seccomp.h
index cc7a4e9cc7ad143bf8c0f9f71c818939462bcf7d,5818e869651b36183fc0e922d6fc279496803118..60f2b350ead7d3ea62e9932808ac8b4c41a80329
--- 1/include/linux/seccomp.h
--- 2/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@@ -28,9 -87,10 +87,10 @@@ static inline int seccomp_mode(struct s
  
  #include <linux/errno.h>
  
- typedef struct { } seccomp_t;
+ struct seccomp { };
+ struct seccomp_filter { };
  
- #define secure_computing(x) do { } while (0)
 -#define secure_computing(x) 0
++static inline int secure_computing(int this_syscall) { return 0; }
  
  static inline long prctl_get_seccomp(void)
  {

diff --cc net/compat.c
Simple merge

diff --cc net/core/filter.c
Simple merge