alistair23-linux/net/decnet
David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-06 22:34:15 -04:00
..
netfilter netfilter: Make nf_hookfn use nf_hook_state. 2015-04-04 12:31:38 -04:00
af_decnet.c net: Remove iocb argument from sendmsg and recvmsg 2015-03-02 13:06:31 -05:00
dn_dev.c netlink: make nlmsg_end() and genlmsg_end() void 2015-01-18 01:03:45 -05:00
dn_fib.c net: tcp: add RTAX_CC_ALGO fib handling 2015-01-05 22:55:24 -05:00
dn_neigh.c DECnet: Only use neigh_ops for adding the link layer header 2015-03-06 14:54:22 -05:00
dn_nsp_in.c net: Fix use after free by removing length arg from sk_data_ready callbacks. 2014-04-11 16:15:36 -04:00
dn_nsp_out.c decnet: use correct RCU API to deref sk_dst_cache field 2013-01-28 00:15:27 -05:00
dn_route.c net: Remove protocol from struct dst_ops 2015-03-09 16:06:10 -04:00
dn_rules.c net: move fib_rules_unregister() under rtnl lock 2015-04-02 20:52:34 -04:00
dn_table.c netlink: make nlmsg_end() and genlmsg_end() void 2015-01-18 01:03:45 -05:00
dn_timer.c decnet: Use time_after_eq 2014-08-22 12:23:11 -07:00
Kconfig net/decnet: remove depends on CONFIG_EXPERIMENTAL 2013-01-11 11:39:34 -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
sysctl_net_decnet.c net: Convert uses of typedef ctl_table to struct ctl_table 2013-06-13 02:36:09 -07:00
TODO Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00

                       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>