Jakub Kicinski 35b1b1fd96 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: net/dsa/port.c 9945c1fb03 ("net: dsa: fix older DSA drivers using phylink") a88dd75384 ("net: dsa: remove legacy_pre_march2020 detection") https://lore.kernel.org/all/20230731102254.2c9868ca@canb.auug.org.au/ net/xdp/xsk.c 3c5b4d69c3 ("net: annotate data-races around sk->sk_mark") b7f72a30e9 ("xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path") https://lore.kernel.org/all/20230731102631.39988412@canb.auug.org.au/ drivers/net/ethernet/broadcom/bnxt/bnxt.c 37b61cda9c ("bnxt: don't handle XDP in netpoll") 2b56b3d992 ("eth: bnxt: handle invalid Tx completions more gracefully") https://lore.kernel.org/all/20230801101708.1dc7faac@canb.auug.org.au/ Adjacent changes: drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c 62da08331f ("net/mlx5e: Set proper IPsec source port in L4 selector") fbd517549c ("net/mlx5e: Add function to get IPsec offload namespace") drivers/net/ethernet/sfc/selftest.c 55c1528f9b ("sfc: fix field-spanning memcpy in selftest") ae9d445cd4 ("sfc: Miscellaneous comment removals") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-08-03 14:34:37 -07:00
..
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
l2tp_core.c	l2tp: prevent lockdep issue in l2tp_tunnel_register()	2023-01-18 14:44:54 +00:00
l2tp_core.h	net: ioctl: Use kernel memory on protocol ioctl callbacks	2023-06-15 22:33:26 -07:00
l2tp_debugfs.c	l2tp: l2tp_debugfs: fix Clang -Wformat warnings	2022-07-08 12:14:36 +01:00
l2tp_eth.c	l2tp: move from strlcpy with unused retval to strscpy	2022-08-22 17:59:46 -07:00
l2tp_ip.c	sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)	2023-06-24 15:50:13 -07:00
l2tp_ip6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-03 14:34:37 -07:00
l2tp_netlink.c	genetlink: start to validate reserved header bytes	2022-08-29 12:47:15 +01:00
l2tp_ppp.c	l2tp: Avoid possible recursive deadlock in l2tp_tunnel_register()	2023-02-20 09:25:20 +00:00
Makefile	l2tp: add tracepoint infrastructure to core	2020-08-22 12:44:37 -07:00
trace.h	l2tp: add tracepoint definitions in trace.h	2020-08-22 12:44:37 -07:00