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
..
core	IB/uverbs: Fix to consider event queue closing also upon non-blocking mode	2023-06-11 11:27:12 +03:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-06-15 22:19:41 -07:00
sw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-06-15 22:19:41 -07:00
ulp	IB/isert: Fix incorrect release of isert connection	2023-06-11 20:29:34 +03:00
Kconfig	RDMA: Disable IB HW for UML	2022-12-04 15:22:03 +02:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00