linux/net/l2tp
David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
xdp_umem.c had overlapping changes between the 64-bit math fix
for the calculation of npgs and the removal of the zerocopy
memory type which got rid of the chunk_size_nohdr member.

The mlx5 Kconfig conflict is a case where we just take the
net-next copy of the Kconfig entry dependency as it takes on
the ESWITCH dependency by one level of indirection which is
what the 'net' conflicting change is trying to ensure.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-05-31 17:48:46 -07:00
..
Kconfig treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
l2tp_core.c l2tp: add sk_family checks to l2tp_validate_socket 2020-05-30 21:56:55 -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 net: partially revert dynamic lockdep key changes 2020-05-04 12:05:56 -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_ip.c l2tp: do not use inet_hash()/inet_unhash() 2020-05-30 21:55:16 -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
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00