|author||Linus Torvalds <firstname.lastname@example.org>||2013-11-23 16:36:35 -0800|
|committer||Linus Torvalds <email@example.com>||2013-11-23 16:36:35 -0800|
|parent||Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff)|
Revert "ima: define '_ima' as a builtin 'trusted' keyring"
This reverts commit 217091dd7a7a1bdac027ddb7c5a25f6ac0b8e241, 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 <firstname.lastname@example.org> Acked-by: Mimi Zohar <email@example.com> Signed-off-by: Linus Torvalds <firstname.lastname@example.org>
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions