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
..
asm-generic	net: core: add getsockopt SO_PEERPIDFD	2023-06-12 10:45:50 +01:00
drm	Merge tag 'drm-msm-next-2023-04-10' of https://gitlab.freedesktop.org/drm/msm into drm-next	2023-04-11 12:21:50 +02:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-06-15 22:19:41 -07:00
misc	habanalabs/uapi: move uapi file to drm	2023-01-26 10:56:23 +02:00
mtd	This pull request contains updates for UBI and UBIFS	2022-10-14 18:23:23 -07:00
rdma	RDMA/efa: Add rdma write capability to device caps	2023-04-21 19:18:58 -03:00
scsi	scsi: mpi3mr: Replace 1-element array with flex-array	2023-02-21 22:00:50 -05:00
sound	ASoC: Intel: Skylake: Fix declaration of enum skl_ch_cfg	2023-05-22 11:18:22 +01:00
video	…
xen	…
Kbuild	…