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

Pull security subsystem updates from James Morris:
 "In this release:

   - PKCS#7 parser for the key management subsystem from David Howells
   - appoint Kees Cook as seccomp maintainer
   - bugfixes and general maintenance across the subsystem"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (94 commits)
  X.509: Need to export x509_request_asymmetric_key()
  netlabel: shorter names for the NetLabel catmap funcs/structs
  netlabel: fix the catmap walking functions
  netlabel: fix the horribly broken catmap functions
  netlabel: fix a problem when setting bits below the previously lowest bit
  PKCS#7: X.509 certificate issuer and subject are mandatory fields in the ASN.1
  tpm: simplify code by using %*phN specifier
  tpm: Provide a generic means to override the chip returned timeouts
  tpm: missing tpm_chip_put in tpm_get_random()
  tpm: Properly clean sysfs entries in error path
  tpm: Add missing tpm_do_selftest to ST33 I2C driver
  PKCS#7: Use x509_request_asymmetric_key()
  Revert "selinux: fix the default socket labeling in sock_graft()"
  X.509: x509_request_asymmetric_keys() doesn't need string length arguments
  PKCS#7: fix sparse non static symbol warning
  KEYS: revert encrypted key change
  ima: add support for measuring and appraising firmware
  firmware_class: perform new LSM checks
  security: introduce kernel_fw_from_file hook
  PKCS#7: Missing inclusion of linux/err.h
  ...

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/include/uapi/asm/unistd.h
index acd5b66ea3aad903ec2345c225270fc6c43fa337,e21b4a069701345c3663add69307ca161e41399c..767ea204334efffdd1966fb595fa90e1b1da24bf
--- 1/arch/arm/include/uapi/asm/unistd.h
--- 2/arch/arm/include/uapi/asm/unistd.h
+++ b/arch/arm/include/uapi/asm/unistd.h
@@@ -409,7 -409,13 +409,8 @@@
  #define __NR_sched_setattr            (__NR_SYSCALL_BASE+380)
  #define __NR_sched_getattr            (__NR_SYSCALL_BASE+381)
  #define __NR_renameat2                        (__NR_SYSCALL_BASE+382)
+ #define __NR_seccomp                  (__NR_SYSCALL_BASE+383)
  
 -/*
 - * This may need to be greater than __NR_last_syscall+1 in order to
 - * account for the padding in the syscall table
 - */
 -
  /*
   * The following SWIs are ARM private.
   */

diff --cc drivers/base/firmware_class.c
Simple merge

diff --cc fs/proc/array.c
Simple merge

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

diff --cc kernel/fork.c
Simple merge

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