Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next

2026-10-14 05:55:17 +00:00 · 2014-09-12 22:40:22 +10:00 · 2014-09-12 22:40:22 +10:00 · ac60ab4b49
commit ac60ab4b49
parent a0cfd75fdc a2d61ed525
16 changed files with 105 additions and 122 deletions
--- a/fs/namei.c
+++ b/fs/namei.c
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
--- a/security/integrity/Kconfig
+++ b/security/integrity/Kconfig
--- a/security/integrity/Makefile
+++ b/security/integrity/Makefile
--- a/security/integrity/digsig_asymmetric.c
+++ b/security/integrity/digsig_asymmetric.c
--- a/security/integrity/evm/Kconfig
+++ b/security/integrity/evm/Kconfig
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h