1
0
Fork 0
alistair23-linux/net/decnet
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
..
netfilter security: remove the security_netlink_recv hook as it is equivalent to capable() 2012-01-05 18:53:01 -05:00
Kconfig [NET]: Rethink mark field in struct flowi 2006-12-02 21:21:39 -08:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
README Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
TODO Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
af_decnet.c decnet: Reduce switch/case indent 2011-07-01 16:11:15 -07:00
dn_dev.c net: reintroduce missing rcu_assign_pointer() calls 2012-01-12 12:26:56 -08:00
dn_fib.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
dn_neigh.c ipv6: Use universal hash for NDISC. 2011-12-28 15:06:58 -05:00
dn_nsp_in.c decnet: Reduce switch/case indent 2011-07-01 16:11:15 -07:00
dn_nsp_out.c decnet: Convert to use flowidn where applicable. 2011-03-12 15:08:55 -08:00
dn_route.c net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}. 2011-12-05 15:20:19 -05:00
dn_rules.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
dn_table.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
dn_timer.c decnet: proper socket refcounting 2011-11-26 15:49:07 -05:00
sysctl_net_decnet.c decnet: Reduce switch/case indent 2011-07-01 16:11:15 -07:00

README

                       Linux DECnet Project
                      ======================

The documentation for this kernel subsystem is available in the
Documentation/networking subdirectory of this distribution and also
on line at http://www.chygwyn.com/DECnet/

Steve Whitehouse <SteveW@ACM.org>