Jakub Kicinski 173780ff18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: include/linux/mlx5/driver.h 617f5db1a6 ("RDMA/mlx5: Fix affinity assignment") dc13180824 ("net/mlx5: Enable devlink port for embedded cpu VF vports") https://lore.kernel.org/all/20230613125939.595e50b8@canb.auug.org.au/ tools/testing/selftests/net/mptcp/mptcp_join.sh 47867f0a7e ("selftests: mptcp: join: skip check if MIB counter not supported") 425ba80312 ("selftests: mptcp: join: support RM_ADDR for used endpoints or not") 45b1a1227a ("mptcp: introduces more address related mibs") 0639fa230a ("selftests: mptcp: add explicit check for new mibs") https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/ No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-06-15 22:19:41 -07:00
..
block	s390/dasd: Use correct lock while counting channel queue length	2023-06-09 11:35:52 -06:00
char	s390 updates for the 6.4 merge window	2023-04-30 11:43:31 -07:00
cio	s390/cio: unregister device when the only path is gone	2023-05-22 12:45:44 +02:00
crypto	s390/pkey: zeroize key blobs	2023-05-15 14:20:13 +02:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-06-15 22:19:41 -07:00
scsi	scsi: zfcp: Declare SCSI host template const	2023-03-24 19:19:20 -04:00
virtio	virtio: add VIRTIO_F_NOTIFICATION_DATA feature support	2023-04-21 03:02:35 -04:00
Makefile	s390: remove pointless drivers-y in drivers/s390/Makefile	2019-09-16 13:21:51 +02:00