David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-02-05 14:33:28 -08:00
..
conntrack.h	netfilter: conntrack: remove timer from ecache extension	2014-06-25 19:15:38 +02:00
core.h
dccp.h
generic.h	BUG: headers with BUG/BUG_ON etc. need linux/bug.h	2012-03-04 17:54:34 -05:00
hash.h	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
ieee802154_6lowpan.h	ieee802154: 6lowpan: ensure MTU of 1280 for 6lowpan	2014-08-19 19:17:42 +02:00
ipv4.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
ipv6.h	ipv6: make fib6 serial number per namespace	2014-10-07 00:02:30 -04:00
mib.h	net: use IS_ENABLED(CONFIG_IPV6)	2011-12-11 18:25:16 -05:00
netfilter.h	netfilter: nf_log: prepare net namespace support for loggers	2013-04-05 20:12:54 +02:00
nftables.h	netfilter: nf_tables: set NLM_F_DUMP_INTR if netlink dumping is stale	2014-07-14 12:00:16 +02:00
packet.h	packet: fix broken build.	2012-08-23 09:29:45 -07:00
sctp.h	Revert "net: sctp: convert sctp_checksum_disable module param into sctp sysctl"	2013-08-09 13:09:41 -07:00
unix.h
x_tables.h	netfilter: kill remnants of ulog targets	2014-07-25 14:55:44 +02:00
xfrm.h	xfrm: Do not hash socket policies	2014-11-13 11:25:03 +01:00