David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
ila	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-23 16:41:27 -07:00
Kconfig	ipv6: sr: select DST_CACHE by default	2017-03-27 16:05:06 -07:00
Makefile	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
addrconf.c	net: rtnetlink: plumb extended ack to doit function	2017-04-17 15:35:38 -04:00
addrconf_core.c	…
addrlabel.c	net: rtnetlink: plumb extended ack to doit function	2017-04-17 15:35:38 -04:00
af_inet6.c	ipv6: add support for NETDEV_RESEND_IGMP event	2017-03-28 22:02:21 -07:00
ah6.c	…
anycast.c	…
calipso.c	…
datagram.c	net-timestamp: avoid use-after-free in ip_recv_error	2017-04-17 12:59:22 -04:00
esp6.c	esp: Use a synchronous crypto algorithm on offloading.	2017-04-14 10:07:19 +02:00
esp6_offload.c	esp4/6: Fix GSO path for non-GSO SW-crypto packets	2017-04-19 07:48:57 +02:00
exthdrs.c	ipv6: sr: fix double free of skb after handling invalid SRH	2017-04-21 13:16:01 -04:00
exthdrs_core.c	…
exthdrs_offload.c	…
fib6_rules.c	…
fou6.c	…
icmp.c	…
inet6_connection_sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
inet6_hashtables.c	…
ip6_checksum.c	…
ip6_fib.c	ipv6: make ECMP route replacement less greedy	2017-03-13 12:16:17 -07:00
ip6_flowlabel.c	…
ip6_gre.c	ip6_tunnel: Allow policy-based routing through tunnels	2017-04-21 13:21:30 -04:00
ip6_icmp.c	…
ip6_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-20 10:35:33 -04:00
ip6_offload.c	net/tunnel: set inner protocol in network gro hooks	2017-03-09 13:19:52 -08:00
ip6_offload.h	…
ip6_output.c	ipv6: avoid write to a possibly cloned skb	2017-03-13 12:53:35 -07:00
ip6_tunnel.c	ip6_tunnel: Allow policy-based routing through tunnels	2017-04-21 13:21:30 -04:00
ip6_udp_tunnel.c	…
ip6_vti.c	ip6_tunnel: Allow policy-based routing through tunnels	2017-04-21 13:21:30 -04:00
ip6mr.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
ipcomp6.c	…
ipv6_sockglue.c	…
mcast.c	ipv6: add support for NETDEV_RESEND_IGMP event	2017-03-28 22:02:21 -07:00
mcast_snoop.c	…
mip6.c	…
ndisc.c	net: ipv6: send unsolicited NA on admin up	2017-04-17 12:44:55 -04:00
netfilter.c	…
output_core.c	…
ping.c	…
proc.c	…
protocol.c	net: Add sysctl to toggle early demux for tcp and udp	2017-03-24 13:17:07 -07:00
raw.c	net: use dst_confirm_neigh for UDP, RAW, ICMP, L2TP	2017-02-07 13:07:47 -05:00
reassembly.c	…
route.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
seg6.c	ipv6: sr: fix out-of-bounds access in SRH validation	2017-04-20 15:40:33 -04:00
seg6_hmac.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-07 16:29:30 -05:00
seg6_iptunnel.c	ipv6: sr: fix BUG due to headroom too small after SRH push	2017-04-17 15:33:53 -04:00
sit.c	ip_tunnel: Allow policy-based routing through tunnels	2017-04-21 13:21:31 -04:00
syncookies.c	…
sysctl_net_ipv6.c	…
tcp_ipv6.c	tcp: Record Rx hash and NAPI ID in tcp_child_process	2017-03-24 20:49:30 -07:00
tcpv6_offload.c	…
tunnel6.c	…
udp.c	net: ipv6: Fix UDP early demux lookup with udp_l3mdev_accept=0	2017-04-20 15:50:27 -04:00
udp_impl.h	…
udp_offload.c	…
udplite.c	…
xfrm6_input.c	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
xfrm6_mode_beet.c	…
xfrm6_mode_ro.c	…
xfrm6_mode_transport.c	xfrm: Add encapsulation header offsets while SKB is not encrypted	2017-04-14 10:07:39 +02:00
xfrm6_mode_tunnel.c	xfrm: Add encapsulation header offsets while SKB is not encrypted	2017-04-14 10:07:39 +02:00
xfrm6_output.c	xfrm: Add an IPsec hardware offloading API	2017-04-14 10:06:10 +02:00
xfrm6_policy.c	xfrm: policy: make policy backend const	2017-02-09 10:22:19 +01:00
xfrm6_protocol.c	xfrm: input: constify xfrm_input_afinfo	2017-02-09 10:22:17 +01:00
xfrm6_state.c	…
xfrm6_tunnel.c	…