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
..
datagram.c	net: add skb frag size accessors	2011-10-19 03:10:46 -04:00
dev_addr_lists.c	net: introduce netif_addr_lock_nested() and call if when appropriate	2012-01-09 12:46:58 -08:00
dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-02 13:49:21 -05:00
drop_monitor.c	net,rcu: convert call_rcu(free_dm_hw_stat) to kfree_rcu()	2011-05-07 22:50:59 -07:00
dst.c	net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.	2011-12-05 15:20:19 -05:00
ethtool.c	ethtool: Remove ethtool_ops::set_rx_ntuple operation	2012-01-04 14:10:28 -05:00
fib_rules.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
filter.c	filter: use unsigned int to silence static checker warning	2011-10-19 19:35:51 -04:00
flow_dissector.c	flow_dissector: use a 64bit load/store	2011-11-29 13:17:03 -05:00
flow.c	net: Add a flow_cache_flush_deferred function	2011-12-21 16:48:08 -05:00
gen_estimator.c	net,rcu: convert call_rcu(__gen_kill_estimator) to kfree_rcu()	2011-05-07 22:50:57 -07:00
gen_stats.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
iovec.c	net: Limit socket I/O iovec total length to INT_MAX.	2010-10-28 11:47:52 -07:00
kmap_skb.h	net: convert core to skb paged frag APIs	2011-08-24 17:52:11 -07:00
link_watch.c	net: linkwatch: allow vlans to get carrier changes faster	2011-09-15 15:36:34 -04:00
Makefile	sock_diag: Move the sock_ code to net/core/	2011-12-06 13:58:02 -05:00
neighbour.c	ipv6: Use universal hash for NDISC.	2011-12-28 15:06:58 -05:00
net_namespace.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
net-sysfs.c	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
net-sysfs.h	xps: Add CONFIG_XPS	2010-11-28 18:24:14 -08:00
net-traces.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
netevent.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
netpoll.c	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
netprio_cgroup.c	Revert "net: netprio_cgroup: make net_prio_subsys static"	2011-12-09 13:39:27 -05:00
pktgen.c	pktgen: set correct max and min in pktgen_setup_inject()	2012-01-07 12:26:08 -08:00
request_sock.c	ipv4:correct description for tcp_max_syn_backlog	2011-12-06 13:02:28 -05:00
rtnetlink.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
scm.c	af_unix: dont send SCM_CREDENTIALS by default	2011-09-28 13:29:50 -04:00
secure_seq.c	net:core: use IS_ENABLED	2011-12-16 15:49:51 -05:00
skbuff.c	net:core: use IS_ENABLED	2011-12-16 15:49:51 -05:00
sock_diag.c	sock_diag: Introduce the meminfo nla core (v2)	2011-12-30 16:42:19 -05:00
sock.c	net: Fix build with INET disabled.	2012-01-09 13:44:23 -08:00
stream.c	net: Fix the condition passed to sk_wait_event()	2010-10-03 20:41:32 -07:00
sysctl_net_core.c	net: use jump_label to shortcut RPS if not setup	2011-11-17 17:06:08 -05:00
timestamping.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
user_dma.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
utils.c	net: Kill ratelimit.h dependency in linux/net.h	2011-05-27 13:41:33 -04:00