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
..
apparmor	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2013-11-21 19:46:00 -08:00
integrity	Revert "ima: define '_ima' as a builtin 'trusted' keyring"	2013-11-23 16:36:35 -08:00
keys	KEYS: Fix keyring content gc scanner	2013-11-14 14:09:53 +00:00
selinux	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2013-11-21 19:46:00 -08:00
smack	Smack: Ptrace access check mode	2013-10-28 10:23:36 -07:00
tomoyo	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
yama	yama: Better permission check for ptraceme	2013-03-26 13:17:58 -07:00
capability.c	Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next	2013-10-22 22:26:41 +11:00
commoncap.c	capabilities: allow nice if we are privileged	2013-08-30 23:44:09 -07:00
device_cgroup.c	device_cgroup: remove can_attach	2013-10-24 06:56:56 -04:00
inode.c	securityfs: fix object creation races	2012-01-10 10:20:35 -05:00
Kconfig	KEYS: Move the key config into security/keys/Kconfig	2012-05-11 10:56:56 +01:00
lsm_audit.c	Merge git://git.infradead.org/users/eparis/audit	2013-11-21 19:18:14 -08:00
Makefile	security: remove erroneous comment about capabilities.o link ordering	2013-09-24 11:26:28 +10:00
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-04-23 08:56:31 +10:00
security.c	Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next	2013-10-22 22:26:41 +11:00