David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-05-09 15:59:24 -04:00

..

conntrack.h

netfilter: conntrack: use single slab cache

2016-05-09 16:45:50 +02:00

core.h

percpu: add __percpu sparse annotations to net

2010-02-16 23:05:38 -08:00

dccp.h

[NETNS][DCCPV6]: Move the dccp_v6_ctl_sk on the struct net.

2008-04-13 22:32:25 -07:00

generic.h

netns: remove BUG_ONs from net_generic()

2015-04-17 15:21:48 -04:00

hash.h

netns: constify net_hash_mix() and various callers

2015-03-18 22:00:34 -04:00

ieee802154_6lowpan.h

ieee802154: 6lowpan: ensure MTU of 1280 for 6lowpan

2014-08-19 19:17:42 +02:00

ipv4.h

net: ipv4: Consider failed nexthops in multipath routes

2016-04-11 15:16:13 -04:00

ipv6.h

ipv6: per netns FIB garbage collection

2016-03-08 15:16:51 -05:00

mib.h

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

mpls.h

mpls: Add a sysctl to control the size of the mpls label table

2015-03-04 00:26:06 -05:00

netfilter.h

netfilter: Per network namespace netfilter hooks.

2015-07-15 18:17:26 +02:00

nftables.h

netfilter: nf_tables: add netdev table to filter from ingress

2015-05-26 18:41:23 +02:00

packet.h

packet: fix broken build.

2012-08-23 09:29:45 -07:00

sctp.h

net: sctp: dynamically enable or disable pf state

2015-12-16 10:56:50 -05:00

unix.h

[NETNS]: struct net content re-work (v3)

2008-01-28 14:57:14 -08:00

x_tables.h

netfilter: don't pull include/linux/netfilter.h from netns headers

2015-06-18 21:14:31 +02:00

xfrm.h

flowcache: Avoid OOM condition under preasure

2016-03-17 10:28:42 +01:00