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

Pull security subsystem updates from James Morris:
 "Highlights:

   - TPM core and driver updates/fixes
   - IPv6 security labeling (CALIPSO)
   - Lots of Apparmor fixes
   - Seccomp: remove 2-phase API, close hole where ptrace can change
     syscall #"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (156 commits)
  apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling
  tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family)
  tpm: Factor out common startup code
  tpm: use devm_add_action_or_reset
  tpm2_i2c_nuvoton: add irq validity check
  tpm: read burstcount from TPM_STS in one 32-bit transaction
  tpm: fix byte-order for the value read by tpm2_get_tpm_pt
  tpm_tis_core: convert max timeouts from msec to jiffies
  apparmor: fix arg_size computation for when setprocattr is null terminated
  apparmor: fix oops, validate buffer size in apparmor_setprocattr()
  apparmor: do not expose kernel stack
  apparmor: fix module parameters can be changed after policy is locked
  apparmor: fix oops in profile_unpack() when policy_db is not present
  apparmor: don't check for vmalloc_addr if kvzalloc() failed
  apparmor: add missing id bounds check on dfa verification
  apparmor: allow SYS_CAP_RESOURCE to be sufficient to prlimit another task
  apparmor: use list_next_entry instead of list_entry_next
  apparmor: fix refcount race when finding a child profile
  apparmor: fix ref count leak when profile sha1 hash is read
  apparmor: check that xindex is in trans_table bounds
  ...

diff --cc Documentation/devicetree/bindings/i2c/trivial-devices.txt
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index d2bce2239769a31ff7c925aba568439c6a4135e4,fe78617d20e9f2abf6eb24383c237b26ccfb42e9..b9361816fc3287073c3156501540c0a53c94178b
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -255,8 -255,8 +256,9 @@@ syna       Synaptics Inc
  synology      Synology, Inc.
  SUNW  Sun Microsystems, Inc
  tbs   TBS Technologies
 -tcl   Toby Churchill Ltd.
+ tcg   Trusted Computing Group
 +tcl   Toby Churchill Ltd.
 +technexion    TechNexion
  technologic   Technologic Systems
  thine THine Electronics, Inc.
  ti    Texas Instruments

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/kernel/ptrace.c
Simple merge

diff --cc arch/powerpc/kernel/ptrace.c
Simple merge

diff --cc arch/x86/entry/common.c
Simple merge

diff --cc arch/x86/entry/vsyscall/vsyscall_64.c
Simple merge

diff --cc include/uapi/linux/Kbuild
Simple merge

diff --cc net/dccp/ipv6.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/iucv/af_iucv.c
Simple merge

diff --cc samples/Kconfig
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

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