David S. Miller 71930d6102 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... All conflicts seemed rather trivial, with some guidance from Saeed Mameed on the tc_ct.c one. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-11 00:46:00 -07:00
..
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
l2tp_core.c	l2tp: remove skb_dst_set() from l2tp_xmit_skb()	2020-07-08 15:24:33 -07:00
l2tp_core.h	l2tp: Replace zero-length array with flexible-array member	2020-02-28 12:08:37 -08:00
l2tp_debugfs.c	l2tp: no need to check return value of debugfs_create functions	2019-06-14 08:45:05 -07:00
l2tp_eth.c	l2tp: fix l2tp_eth_dev_xmit()'s return type	2020-06-28 20:52:53 -07:00
l2tp_ip.c	l2tp: do not use inet_hash()/inet_unhash()	2020-05-30 21:55:16 -07:00
l2tp_ip6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
l2tp_netlink.c	l2tp: Allow management of tunnels and session in user namespace	2020-04-08 14:30:46 -07:00
l2tp_ppp.c	compat_ioctl: pppoe: fix PPPOEIOCSFWD handling	2019-07-30 14:42:13 -07:00