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
..
felix_vsc9959.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-06-15 22:19:41 -07:00
felix.c	net: dsa: felix: remove confusing/incorrect comment from felix_setup()	2023-04-13 21:56:06 -07:00
felix.h	net: dsa: felix: allow serdes configuration for dsa ports	2023-03-20 09:08:48 +00:00
Kconfig	net: dsa: ocelot: fix selecting MFD_OCELOT	2023-02-16 13:03:15 +01:00
Makefile
ocelot_ext.c	net: dsa: ocelot: add support for external phys	2023-03-20 09:08:48 +00:00
seville_vsc9953.c	net: dsa: ocelot: use lynx_pcs_create_mdiodev()	2023-05-29 21:46:53 -07:00