linux-next

mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00

History

Pablo Neira Ayuso f0a0a978b6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next This merge resolves conflicts with `75aec9df3a` ("bridge: Remove br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve netns support in the network stack that reached upstream via David's net-next tree. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Conflicts: net/bridge/br_netfilter_hooks.c		2015-10-17 14:28:03 +02:00
..
netfilter	netfilter: Pass priv instead of nf_hook_ops to netfilter hooks	2015-09-18 22:00:16 +02:00
af_decnet.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04: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	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
dn_nsp_in.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
dn_nsp_out.c	net: Pass net into dst_output and remove dst_output_okfn	2015-10-08 04:26:54 -07:00
dn_route.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
dn_rules.c	net: ipv6: use common fib_default_rule_pref	2015-09-09 14:19:50 -07: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
README
sysctl_net_decnet.c	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00
TODO

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>