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
..
block	block-6.5-2023-07-28	2023-07-28 10:23:41 -07:00
char	s390 updates for 6.5 merge window part 2	2023-07-06 13:18:30 -07:00
cio	s390: fix various typos	2023-07-03 11:19:42 +02:00
crypto	s390/zcrypt: fix reply buffer calculations for CCA replies	2023-07-20 16:48:56 +02:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-03 14:34:37 -07:00
scsi	scsi: zfcp: Defer fc_rport blocking until after ADISC response	2023-07-25 21:54:05 -04:00
virtio	virtio: add VIRTIO_F_NOTIFICATION_DATA feature support	2023-04-21 03:02:35 -04:00
Makefile	…