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
..
ccids	dccp: tfrc: fix doc warnings in tfrc_equation.c	2021-06-10 14:08:49 -07:00
ackvec.c	net: dccp: Fix most of the kerneldoc warnings	2020-10-30 12:08:54 -07:00
ackvec.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
ccid.c	net: dccp: Add __printf() markup to fix -Wsuggest-attribute=format	2020-10-30 11:31:46 -07:00
ccid.h	net: dccp: Replace zero-length array with flexible-array member	2020-02-28 12:08:37 -08:00
dccp.h	net: ioctl: Use kernel memory on protocol ioctl callbacks	2023-06-15 22:33:26 -07:00
diag.c	inet_diag: Move the INET_DIAG_REQ_BYTECODE nlattr to cb->data	2020-02-27 18:50:19 -08:00
feat.c	dccp: Return the correct errno code	2021-02-06 11:15:28 -08:00
feat.h	dccp: Remove unused declaration dccp_feat_initialise_sysctls()	2023-07-27 17:16:26 -07:00
input.c	net: dccp: Convert to use the preferred fallthrough macro	2020-08-22 12:38:34 -07:00
ipv4.c	dccp: Set TOS and routing scope independently for fib lookups.	2023-07-19 12:32:07 +01:00
ipv6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-03 14:34:37 -07:00
ipv6.h	ipv6: remove hard coded limitation on ipv6_pinfo	2023-07-24 09:39:31 +01:00
Kconfig	dccp: Replace HTTP links with HTTPS ones	2020-07-13 11:54:07 -07:00
Makefile	net: dccp: Remove dccpprobe module	2018-01-02 14:27:30 -05:00
minisocks.c	tcp: allocate tcp_death_row outside of struct netns_ipv4	2022-01-26 19:00:31 -08:00
options.c	net: dccp: Convert to use the preferred fallthrough macro	2020-08-22 12:38:34 -07:00
output.c	net: dccp: Fix most of the kerneldoc warnings	2020-10-30 12:08:54 -07:00
proto.c	net: ioctl: Use kernel memory on protocol ioctl callbacks	2023-06-15 22:33:26 -07:00
qpolicy.c	net: dccp: Fix most of the kerneldoc warnings	2020-10-30 12:08:54 -07:00
sysctl.c	proc/sysctl: add shared variables for range check	2019-07-18 17:08:07 -07:00
timer.c	dccp: annotate lockless accesses to sk->sk_err_soft	2023-03-17 08:25:05 +00:00
trace.h	net: dccp: Use memset_startat() for TP zeroing	2021-11-19 11:22:49 +00:00