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
..
9p
802
8021q
appletalk
atm
ax25
batman-adv
bluetooth
bridge
caif
can
ceph
core	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
dcb
dccp
decnet	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
dns_resolver
dsa
econet
ethernet
ieee802154
ipv4	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
ipv6	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
ipx
irda
iucv
key
l2tp
lapb
llc
mac80211
netfilter	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
netlabel
netlink	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
netrom
nfc
openvswitch
packet
phonet
rds
rfkill
rose
rxrpc
sched
sctp
sunrpc	Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux	2012-01-14 12:26:41 -08:00
tipc
unix
wanrouter
wimax
wireless
x25
xfrm	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
compat.c
Kconfig
Makefile
nonet.c
socket.c
sysctl_net.c