Linus Torvalds c49c41a413 Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security ... * 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: capabilities: remove __cap_full_set definition security: remove the security_netlink_recv hook as it is equivalent to capable() ptrace: do not audit capability check when outputing /proc/pid/stat capabilities: remove task_ns_* functions capabitlies: ns_capable can use the cap helpers rather than lsm call capabilities: style only - move capable below ns_capable capabilites: introduce new has_ns_capabilities_noaudit capabilities: call has_ns_capability from has_capability capabilities: remove all _real_ interfaces capabilities: introduce security_capable_noaudit capabilities: reverse arguments to security_capable capabilities: remove the task from capable LSM hook entirely selinux: sparse fix: fix several warnings in the security server cod selinux: sparse fix: fix warnings in netlink code selinux: sparse fix: eliminate warnings for selinuxfs selinux: sparse fix: declare selinux_disable() in security.h selinux: sparse fix: move selinux_complete_init selinux: sparse fix: make selinux_secmark_refcount static SELinux: Fix RCU deref check warning in sel_netport_insert() Manually fix up a semantic mis-merge wrt security_netlink_recv(): - the interface was removed in commit fd77846152 ("security: remove the security_netlink_recv hook as it is equivalent to capable()") - a new user of it appeared in commit a38f7907b9 ("crypto: Add userspace configuration API") causing no automatic merge conflict, but Eric Paris pointed out the issue.		2012-01-14 18:36:33 -08:00
..
include	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
.gitignore	.gitignore: ignore apparmor/rlim_names.h	2010-10-21 10:12:35 +11:00
apparmorfs.c	switch securityfs_create_file() to umode_t	2012-01-03 22:55:13 -05:00
audit.c	apparmor: add missing rcu_dereference()	2011-12-09 12:08:41 +11:00
capability.c	AppArmor: mediation of non file objects	2010-08-02 15:38:35 +10:00
context.c	AppArmor: contexts used in attaching policy to system objects	2010-08-02 15:35:12 +10:00
domain.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-07-27 19:26:38 -07:00
file.c	AppArmor: file enforcement routines	2010-08-02 15:35:14 +10:00
ipc.c	apparmor: sparse fix: include ipc.h	2011-09-09 16:56:27 -07:00
Kconfig	apparmor: depends on NET	2010-08-05 07:36:51 -04:00
lib.c	apparmor: sparse fix: add apparmor.h to lib.c	2011-09-09 16:56:28 -07:00
lsm.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
Makefile	AppArmor: cleanup generated files correctly	2011-03-08 17:03:53 -08:00
match.c	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
path.c	btrfs, nfs, apparmor: don't pull mnt_namespace.h for no reason...	2012-01-03 22:52:38 -05:00
policy_unpack.c	apparmor: sparse fix: rename shadowed variables in policy_unpack.c	2011-09-09 16:56:28 -07:00
policy.c	APPARMOR: Fix memory leak of alloc_namespace()	2010-11-11 07:36:18 +11:00
procattr.c	apparmor: sparse fix: include procattr.h in procattr.c	2011-09-09 16:56:29 -07:00
resource.c	AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes	2010-09-08 09:19:29 +10:00
sid.c	AppArmor: core policy routines	2010-08-02 15:38:37 +10:00