linux_dsm_epyc7002/net/l2tp
David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-05-02 22:14:21 -04:00
..
Kconfig l2tp: Call udp_sock_create 2014-07-14 16:12:15 -07:00
l2tp_core.c l2ip: fix possible use-after-free 2019-04-30 11:35:48 -04:00
l2tp_core.h l2tp: fix reading optional fields of L2TPv3 2019-01-30 21:44:17 -08:00
l2tp_debugfs.c l2tp: ignore L2TP_ATTR_MTU 2018-08-03 10:03:57 -07:00
l2tp_eth.c l2tp: fix unused function warning 2018-08-13 20:45:49 -07:00
l2tp_ip6.c net: rework SIOCGSTAMP ioctl handling 2019-04-19 14:07:40 -07:00
l2tp_ip.c net: rework SIOCGSTAMP ioctl handling 2019-04-19 14:07:40 -07:00
l2tp_netlink.c genetlink: optionally validate strictly/dumps 2019-04-27 17:07:22 -04:00
l2tp_ppp.c l2tp: fix set but not used variable 2019-04-18 17:06:15 -07:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00