David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-17 20:20:36 -07:00
..
ila	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
addrconf_core.c	ipv6: Add delete route hook to stubs	2019-05-22 17:48:43 -07:00
addrconf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
addrlabel.c	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
af_inet6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
ah6.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
anycast.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
calipso.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
datagram.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
esp6_offload.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422	2019-06-05 17:37:15 +02:00
esp6.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
exthdrs_core.c	treewide: Add SPDX license identifier for missed files	2019-05-21 10:50:45 +02:00
exthdrs_offload.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
exthdrs.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
fib6_notifier.c	net: Add module reference to FIB notifiers	2017-09-01 20:33:42 -07:00
fib6_rules.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 372	2019-06-05 17:37:10 +02:00
fou6.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
icmp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
inet6_connection_sock.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
inet6_hashtables.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
ip6_checksum.c	net: udp: fix handling of CHECKSUM_COMPLETE packets	2018-10-24 14:18:16 -07:00
ip6_fib.c	ipv6: Handle all fib6_nh in a nexthop in fib6_drop_pcpu_from	2019-06-10 10:44:56 -07:00
ip6_flowlabel.c	ipv6: flowlabel: fl6_sock_lookup() must use atomic_inc_not_zero	2019-06-09 13:07:14 -07:00
ip6_gre.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ip6_icmp.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ip6_input.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ip6_offload.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ip6_offload.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ip6_output.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
ip6_tunnel.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ip6_udp_tunnel.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ip6_vti.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ip6mr.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ipcomp6.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
ipv6_sockglue.c	SPDX update for 5.2-rc3, round 1	2019-05-31 08:34:32 -07:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	xfrm: make xfrm modes builtin	2019-04-08 09:15:17 +02:00
mcast_snoop.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 343	2019-06-05 17:37:07 +02:00
mcast.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
mip6.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
ndisc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
netfilter.c	net: fix use-after-free in kfree_skb_list	2019-06-03 15:18:00 -07:00
output_core.c	treewide: Add SPDX license identifier for missed files	2019-05-21 10:50:45 +02:00
ping.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
proc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
protocol.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
raw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 09:29:14 -07:00
reassembly.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
route.c	ipv6: Allow routes to use nexthop objects	2019-06-10 10:44:57 -07:00
seg6_hmac.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
seg6_iptunnel.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
seg6_local.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
seg6.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
sit.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
syncookies.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
sysctl_net_ipv6.c	ipv6: tcp: enable flowlabel reflection in some RST packets	2019-06-05 19:05:01 -07:00
tcp_ipv6.c	ipv4: tcp: fix ACK/RST sent with a transmit delay	2019-06-14 19:51:12 -07:00
tcpv6_offload.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
tunnel6.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
udp_impl.h	udp6: add missing rehash callback to udplite	2019-01-17 15:01:08 -08:00
udp_offload.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
udp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
udplite.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xfrm6_input.c	net: use skb_sec_path helper in more places	2018-12-19 11:21:37 -08:00
xfrm6_output.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xfrm6_policy.c	xfrm: remove decode_session indirection from afinfo_policy	2019-04-23 07:42:20 +02:00
xfrm6_protocol.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xfrm6_state.c	xfrm: remove VLA usage in __xfrm6_sort()	2018-04-26 07:51:48 +02:00
xfrm6_tunnel.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00