Linus Torvalds bea803183e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security subsystem updates from James Morris: "Apart from reordering the SELinux mmap code to ensure DAC is called before MAC, these are minor maintenance updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (23 commits) selinux: correctly label /proc inodes in use before the policy is loaded selinux: put the mmap() DAC controls before the MAC controls selinux: fix the output of ./scripts/get_maintainer.pl for SELinux evm: enable key retention service automatically ima: skip memory allocation for empty files evm: EVM does not use MD5 ima: return d_name.name if d_path fails integrity: fix checkpatch errors ima: fix erroneous removal of security.ima xattr security: integrity: Use a more current logging style MAINTAINERS: email updates and other misc. changes ima: reduce memory usage when a template containing the n field is used ima: restore the original behavior for sending data with ima template Integrity: Pass commname via get_task_comm() fs: move i_readcount ima: use static const char array definitions security: have cap_dentry_init_security return error ima: new helper: file_inode(file) kernel: Mark function as static in kernel/seccomp.c capability: Use current logging styles ...		2014-04-03 09:26:18 -07:00
..
encrypted-keys	security: replace strict_strto*() with kstrto*()	2014-02-06 19:11:04 +11:00
big_key.c	security: shmem: implement kernel private shmem inodes	2013-12-02 11:24:19 +00:00
compat.c	security/compat: convert to COMPAT_SYSCALL_DEFINE	2014-03-06 16:30:42 +01:00
gc.c
internal.h
Kconfig
key.c
keyctl.c
keyring.c	KEYS: Make the keyring cycle detector ignore other keyrings of the same name	2014-03-09 18:57:18 -07:00
Makefile
permission.c
persistent.c
proc.c
process_keys.c
request_key_auth.c
request_key.c
sysctl.c
trusted.c	security: replace strict_strto*() with kstrto*()	2014-02-06 19:11:04 +11:00
trusted.h
user_defined.c