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	selinux: sparse fix: fix several warnings in the security server cod	2012-01-05 18:52:52 -05:00
ss	selinux: sparse fix: fix several warnings in the security server cod	2012-01-05 18:52:52 -05:00
.gitignore	SELinux: add .gitignore files for dynamic classes	2009-10-24 09:42:27 +08:00
Kconfig	selinux: Deprecate and schedule the removal of the the compat_net functionality	2008-12-31 12:54:11 -05:00
Makefile	selinux: change to new flag variable	2010-10-21 10:12:40 +11:00
avc.c	selinux: don't transliterate MAY_NOT_BLOCK to IPERM_FLAG_RCU	2011-07-20 01:43:27 -04:00
exports.c	selinux: sparse fix: include selinux.h in exports.c	2011-09-09 16:56:32 -07:00
hooks.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
netif.c	doc: Update the email address for Paul Moore in various source files	2011-08-01 17:58:33 -07:00
netlabel.c	doc: Update the email address for Paul Moore in various source files	2011-08-01 17:58:33 -07:00
netlink.c	selinux: sparse fix: fix warnings in netlink code	2012-01-05 18:52:51 -05:00
netnode.c	net: remove ipv6_addr_copy()	2011-11-22 16:43:32 -05:00
netport.c	SELinux: Fix RCU deref check warning in sel_netport_insert()	2011-12-21 11:28:56 +11:00
nlmsgtab.c	selinux: sparse fix: fix warnings in netlink code	2012-01-05 18:52:51 -05:00
selinuxfs.c	selinux: sparse fix: fix warnings in netlink code	2012-01-05 18:52:51 -05:00
xfrm.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00