David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
Kconfig	l2tp: Call udp_sock_create	2014-07-14 16:12:15 -07:00
l2tp_core.c	l2tp: fix tunnel lookup use-after-free race	2018-02-26 12:20:37 -05:00
l2tp_core.h	l2tp: fix races with tunnel socket close	2018-02-26 12:20:36 -05:00
l2tp_debugfs.c	l2tp: remove l2specific_len configurable parameter	2018-01-19 15:00:49 -05:00
l2tp_eth.c	l2tp: remove .tunnel_sock from struct l2tp_eth	2017-11-11 22:08:23 +09:00
l2tp_ip6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
l2tp_ip.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
l2tp_netlink.c	l2tp: remove switch block in l2tp_nl_cmd_session_create()	2018-01-19 15:10:23 -05:00
l2tp_ppp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00