Merge tag 'fw-restrict-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next

2026-10-14 05:55:17 +00:00 · 2014-07-26 10:40:28 +10:00 · 2014-07-26 10:40:28 +10:00 · f6fd5c84b9
commit f6fd5c84b9
parent ed3c4f8f86 5a9196d715
11 changed files with 104 additions and 8 deletions
--- a/Documentation/ABI/testing/ima_policy
+++ b/Documentation/ABI/testing/ima_policy
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/security/capability.c
+++ b/security/capability.c
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
--- a/security/security.c
+++ b/security/security.c