• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security · e7691a1c
    Linus Torvalds authored
    * 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: (32 commits)
      ima: fix invalid memory reference
      ima: free duplicate measurement memory
      security: update security_file_mmap() docs
      selinux: Casting (void *) value returned by kmalloc is useless
      apparmor: fix module parameter handling
      Security: tomoyo: add .gitignore file
      tomoyo: add missing rcu_dereference()
      apparmor: add missing rcu_dereference()
      evm: prevent racing during tfm allocation
      evm: key must be set once during initialization
      mpi/mpi-mpow: NULL dereference on allocation failure
      digsig: build dependency fix
      KEYS: Give key types their own lockdep class for key->sem
      TPM: fix transmit_cmd error logic
      TPM: NSC and TIS drivers X86 dependency fix
      TPM: Export wait_for_stat for other vendor specific drivers
      TPM: Use vendor specific function for status probe
      tpm_tis: add delay after aborting command
      tpm_tis: Check return code from getting timeouts/durations
      tpm: Introduce function to poll for result of self test
      ...
    
    Fix up trivial conflict in lib/Makefile due to addition of CONFIG_MPI
    and SIGSIG next to CONFIG_DQL addition.
    e7691a1c
Kconfig 6.9 KB