Linus Torvalds 34ef7bd382 Revert "ima: define '_ima' as a builtin 'trusted' keyring" ... This reverts commit 217091dd7a, which caused the following build error: security/integrity/digsig.c:70:5: error: redefinition of ‘integrity_init_keyring’ security/integrity/integrity.h:149:12: note: previous definition of ‘integrity_init_keyring’ w security/integrity/integrity.h:149:12: warning: ‘integrity_init_keyring’ defined but not used reported by Krzysztof Kolasa. Mimi says: "I made the classic mistake of requesting this patch to be upstreamed at the last second, rather than waiting until the next open window. At this point, the best course would probably be to revert the two commits and fix them for the next open window" Reported-by: Krzysztof Kolasa <kkolasa@winsoft.pl> Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2013-11-23 16:36:35 -08:00
..
evm	ima: pass full xattr with the signature	2013-10-25 17:16:59 -04:00
ima	Revert "ima: define '_ima' as a builtin 'trusted' keyring"	2013-11-23 16:36:35 -08:00
digsig.c	Revert "ima: define '_ima' as a builtin 'trusted' keyring"	2013-11-23 16:36:35 -08:00
digsig_asymmetric.c	ima: read and use signature hash algorithm	2013-10-25 17:16:59 -04:00
iint.c	ima: use dynamically allocated hash storage	2013-10-25 17:17:00 -04:00
integrity.h	Revert "ima: define '_ima' as a builtin 'trusted' keyring"	2013-11-23 16:36:35 -08:00
integrity_audit.c	integrity: move integrity_audit_msg()	2013-06-20 07:47:49 -04:00
Kconfig	integrity: move integrity_audit_msg()	2013-06-20 07:47:49 -04:00
Makefile	integrity: move integrity_audit_msg()	2013-06-20 07:47:49 -04:00