linux/net/l2tp
David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Lots of overlapping changes, mostly trivial in nature.

The mlxsw conflict was resolving using the example
resolution at:

https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-05 13:04:31 -07:00
..
Kconfig l2tp: Call udp_sock_create 2014-07-14 16:12: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
l2tp_core.c l2tp: ignore L2TP_ATTR_MTU 2018-08-03 10:03:57 -07:00
l2tp_core.h l2tp: ignore L2TP_ATTR_MTU 2018-08-03 10:03:57 -07:00
l2tp_debugfs.c l2tp: ignore L2TP_ATTR_MTU 2018-08-03 10:03:57 -07:00
l2tp_eth.c l2tp: ignore L2TP_ATTR_MTU 2018-08-03 10:03:57 -07:00
l2tp_ip.c l2tp: remove ->recv_payload_hook 2018-07-26 14:06:34 -07:00
l2tp_ip6.c l2tp: remove ->recv_payload_hook 2018-07-26 14:06:34 -07:00
l2tp_netlink.c l2tp: ignore L2TP_ATTR_MTU 2018-08-03 10:03:57 -07:00
l2tp_ppp.c Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2018-08-05 13:04:31 -07:00