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
..
ip6_queue.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
ip6_tables.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	2011-04-19 11:24:06 -07:00
ip6t_ah.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
ip6t_eui64.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
ip6t_frag.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
ip6t_hbh.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
ip6t_ipv6header.c	netfilter: xtables: deconstify struct xt_action_param for matches	2010-05-11 18:33:37 +02:00
ip6t_LOG.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-02-19 19:17:35 -08:00
ip6t_mh.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
ip6t_REJECT.c	ipv6: Add fragment reporting to ipv6_skip_exthdr().	2011-12-03 09:35:10 -08:00
ip6t_rpfilter.c	netfilter: add ipv6 reverse path filter match	2011-12-13 11:34:43 +01:00
ip6t_rt.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
ip6table_filter.c	module_param: make bool parameters really bool (net & drivers/net)	2011-12-19 22:27:29 -05:00
ip6table_mangle.c	netfilter: ip6table_mangle: Fix set-but-unused variables.	2011-04-17 17:06:15 -07:00
ip6table_raw.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ip6table_security.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	netfilter: add ipv6 reverse path filter match	2011-12-13 11:34:43 +01:00
Makefile	netfilter: add ipv6 reverse path filter match	2011-12-13 11:34:43 +01:00
nf_conntrack_l3proto_ipv6.c	netfilter: add more values to enum ip_conntrack_info	2011-06-06 01:35:10 +02:00
nf_conntrack_proto_icmpv6.c	netfilter: nf_conntrack: fix ct refcount leak in l4proto->error()	2011-06-06 01:37:02 +02:00
nf_conntrack_reasm.c	netfilter: Remove unnecessary OOM logging messages	2011-11-01 09:19:49 +01:00
nf_defrag_ipv6_hooks.c	Fix common misspellings	2011-03-31 11:26:23 -03:00