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	ipv6: change ipv6_stub_impl.ipv6_dst_lookup to take net argument	2015-07-31 15:21:30 -07:00
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	IPsec: do not ignore crypto err in ah6 input	2017-01-16 12:57:48 +01:00
anycast.c	ipv6: coding style: comparison for equality with NULL	2015-03-31 13:51:54 -04:00
calipso.c	calipso: fix resource leak on calipso_genopt failure	2016-08-13 14:56:17 -07:00
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	ipv6: constify the skb pointer of ipv6_find_tlv().	2016-06-27 15:06:15 -04:00
exthdrs_offload.c	ipv6: fix exthdrs offload registration in out_rt path	2015-09-02 15:31:00 -07:00
fib6_rules.c	net: flow: Add l3mdev flow update	2016-09-10 23:12:51 -07:00
fou6.c	fou: add Kconfig options for IPv6 support	2016-05-29 22:24:21 -07:00
icmp.c	net: for rate-limited ICMP replies save one atomic operation	2017-01-09 15:49:12 -05:00
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	inet: collapse ipv4/v6 rcv_saddr_equal functions into one	2017-01-18 13:04:28 -05:00
ip6_checksum.c	ipv6: fix checksum annotation in udp6_csum_init	2016-06-14 15:26:42 -04:00
ip6_fib.c	ipv6: make ECMP route replacement less greedy	2017-03-13 12:16:17 -07:00
ip6_flowlabel.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
ip6_gre.c	ip6_tunnel: Allow policy-based routing through tunnels	2017-04-21 13:21:30 -04:00
ip6_icmp.c	ipv6: icmp: add a force_saddr param to icmp6_send()	2016-06-18 22:11:38 -07:00
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	udp: Add GRO functions to UDP socket	2016-04-07 16:53:29 -04:00
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_udp_tunnel: remove unused IPCB related codes	2016-11-02 15:18:36 -04:00
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	net: inet: Support UID-based routing in IP protocols.	2016-11-04 14:45:23 -04:00
ipv6_sockglue.c	net: Allow IP_MULTICAST_IF to set index to L3 slave	2016-12-30 15:24:47 -05:00
mcast.c	ipv6: add support for NETDEV_RESEND_IGMP event	2017-03-28 22:02:21 -07:00
mcast_snoop.c	net: fix wrong skb_get() usage / crash in IGMP/MLD parsing code	2015-08-13 17:08:39 -07:00
mip6.c	ktime: Get rid of ktime_equal()	2016-12-25 17:21:23 +01:00
ndisc.c	net: ipv6: send unsolicited NA on admin up	2017-04-17 12:44:55 -04:00
netfilter.c	net: inet: Support UID-based routing in IP protocols.	2016-11-04 14:45:23 -04:00
output_core.c	ipv6: Set skb->protocol properly for local output	2016-12-02 12:34:22 -05:00
ping.c	ipv6: remove unnecessary inet6_sk check	2016-12-29 12:05:49 -05:00
proc.c	proc: Reduce cache miss in snmp6_seq_show	2016-09-30 01:50:44 -04:00
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	ipv6: on reassembly, record frag_max_size	2016-11-03 15:41:11 -04:00
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	syncookies: use SipHash in place of SHA1	2017-01-09 13:58:57 -05:00
sysctl_net_ipv6.c	calipso: Add a label cache.	2016-06-27 15:06:17 -04:00
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	tcp: cleanup static functions	2015-02-28 16:56:51 -05:00
tunnel6.c	ipv6: fix tunnel error handling	2015-11-03 10:52:13 -05:00
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	udplite: call proper backlog handlers	2016-11-24 15:32:14 -05:00
udp_offload.c	gso: Remove arbitrary checks for unsupported GSO	2016-05-20 18:03:15 -04:00
udplite.c	udplite: call proper backlog handlers	2016-11-24 15:32:14 -05:00
xfrm6_input.c	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
xfrm6_mode_beet.c	xfrm: simplify xfrm_address_t use	2015-03-31 13:58:35 -04:00
xfrm6_mode_ro.c	ipv4/ipv6: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
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	ipv6: White-space cleansing : Line Layouts	2014-08-24 22:37:52 -07:00
xfrm6_tunnel.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00