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
..
apparmor	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
integrity	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
keys	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
selinux	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
smack	vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb	2012-01-06 23:16:53 -05:00
tomoyo	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-10 21:51:23 -08:00
capability.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
commoncap.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
device_cgroup.c	cgroup: introduce cgroup_taskset and use it in subsys->can_attach(), cancel_attach() and attach()	2011-12-12 18:12:21 -08:00
inode.c	securityfs: fix object creation races	2012-01-10 10:20:35 -05:00
Kconfig	encrypted-keys: remove trusted-keys dependency	2011-09-14 15:23:49 -04:00
lsm_audit.c	ipv6: Add fragment reporting to ipv6_skip_exthdr().	2011-12-03 09:35:10 -08:00
Makefile	integrity: move ima inode integrity data management	2011-07-18 12:29:38 -04:00
min_addr.c
security.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00