• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · a3443cda
    Linus Torvalds authored
    Pull security subsystem updates from James Morris:
       - overlayfs support, necessary for container filesystems
       - finally remove the kernel_module_from_file hook
       - treat signal delivery as an 'append' operation
       - lots of bugfixes & updates
       - new audit data type: LSM_AUDIT_DATA_FILE
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (47 commits)
      Revert "tpm/tpm_crb: implement tpm crb idle state"
      Revert "tmp/tpm_crb: fix Intel PTT hw bug during idle state"
      Revert "tpm/tpm_crb: open code the crb_init into acpi_add"
      Revert "tmp/tpm_crb: implement runtime pm for tpm_crb"
      lsm,audit,selinux: Introduce a new audit data type LSM_AUDIT_DATA_FILE
      tmp/tpm_crb: implement runtime pm for tpm_crb
      tpm/tpm_crb: open code the crb_init into acpi_add
      tmp/tpm_crb: fix Intel PTT hw bug during idle state
      tpm/tpm_crb: implement tpm crb idle state
      tpm: add check for minimum buffer size in tpm_transmit()
      tpm: constify TPM 1.x header structures
      tpm/tpm_crb: fix the over 80 characters checkpatch warring
      tpm/tpm_crb: drop useless cpu_to_le32 when writing to registers
      tpm/tpm_crb: cache cmd_size register value.
      tmp/tpm_crb: drop include to platform_device
      tpm/tpm_tis: remove unused itpm variable
      tpm_crb: fix incorrect values of cmdReady and goIdle bits
      tpm_crb: refine the naming of constants
      tpm_crb: remove wmb()'s
      tpm_crb: fix crb_req_canceled behavior