Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

Pull security subsystem updates from James Morris:
 "New notable features:
   - The seccomp work from Will Drewry
   - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski
   - Longer security labels for Smack from Casey Schaufler
   - Additional ptrace restriction modes for Yama by Kees Cook"

Fix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)
  apparmor: fix long path failure due to disconnected path
  apparmor: fix profile lookup for unconfined
  ima: fix filename hint to reflect script interpreter name
  KEYS: Don't check for NULL key pointer in key_validate()
  Smack: allow for significantly longer Smack labels v4
  gfp flags for security_inode_alloc()?
  Smack: recursive tramsmute
  Yama: replace capable() with ns_capable()
  TOMOYO: Accept manager programs which do not start with / .
  KEYS: Add invalidation support
  KEYS: Do LRU discard in full keyrings
  KEYS: Permit in-place link replacement in keyring list
  KEYS: Perform RCU synchronisation on keys prior to key destruction
  KEYS: Announce key type (un)registration
  KEYS: Reorganise keys Makefile
  KEYS: Move the key config into security/keys/Kconfig
  KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat
  Yama: remove an unused variable
  samples/seccomp: fix dependencies on arch macros
  Yama: add additional ptrace scopes
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
index c940cb6,3a41c44..2787fbe
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -81,8 -81,8 +81,9 @@@ config X8
        select CLKEVT_I8253
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
 -      select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
 +      select DCACHE_WORD_ACCESS
 +      select GENERIC_SMP_IDLE_THREAD
+       select HAVE_ARCH_SECCOMP_FILTER
  
  config INSTRUCTION_DECODER
        def_bool (KPROBES || PERF_EVENTS)

diff --cc include/linux/Kbuild
Simple merge

diff --cc include/linux/filter.h
index 7209099,f2e5315..82b0135
--- 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/sched.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc net/compat.c
Simple merge

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

diff --cc net/dns_resolver/dns_key.c
Simple merge

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