Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
* '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.
Showing
Documentation/digsig.txt
0 → 100644
include/linux/digsig.h
0 → 100644
include/linux/mpi.h
0 → 100644
lib/digsig.c
0 → 100644
lib/mpi/Makefile
0 → 100644
lib/mpi/generic_mpih-add1.c
0 → 100644
lib/mpi/generic_mpih-mul1.c
0 → 100644
lib/mpi/generic_mpih-mul2.c
0 → 100644
lib/mpi/generic_mpih-mul3.c
0 → 100644
lib/mpi/generic_mpih-sub1.c
0 → 100644
lib/mpi/longlong.h
0 → 100644
lib/mpi/mpi-add.c
0 → 100644
lib/mpi/mpi-bit.c
0 → 100644
lib/mpi/mpi-cmp.c
0 → 100644
lib/mpi/mpi-div.c
0 → 100644
lib/mpi/mpi-gcd.c
0 → 100644
lib/mpi/mpi-inline.c
0 → 100644
lib/mpi/mpi-inline.h
0 → 100644
lib/mpi/mpi-internal.h
0 → 100644
lib/mpi/mpi-inv.c
0 → 100644
lib/mpi/mpi-mpow.c
0 → 100644
lib/mpi/mpi-mul.c
0 → 100644
lib/mpi/mpi-pow.c
0 → 100644
lib/mpi/mpi-scan.c
0 → 100644
lib/mpi/mpicoder.c
0 → 100644
lib/mpi/mpih-cmp.c
0 → 100644
lib/mpi/mpih-div.c
0 → 100644
lib/mpi/mpih-mul.c
0 → 100644
lib/mpi/mpiutil.c
0 → 100644
security/integrity/digsig.c
0 → 100644
security/tomoyo/.gitignore
0 → 100644
Please register or sign in to comment