Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicts:

tools/testing/selftests/net/config
  62199e3f1658 ("selftests: net: Add VXLAN MDB test")
  3a0385be133e ("selftests: add the missing CONFIG_IP_SCTP in net config")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/loongarch/net/bpf_jit.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
Simple merge

diff --cc drivers/net/phy/sfp.c
Simple merge

diff --cc include/linux/mlx5/device.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/linux/rtnetlink.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/subflow.c
Simple merge

diff --cc tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
Simple merge

diff --cc tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
Simple merge

diff --cc tools/testing/selftests/net/config
index 4c7ce07,2529226..d1d421e
--- 1/tools/testing/selftests/net/config
--- 2/tools/testing/selftests/net/config
+++ b/tools/testing/selftests/net/config
@@@ -48,4 -48,4 +48,5 @@@ CONFIG_BAREUDP=
  CONFIG_IPV6_IOAM6_LWTUNNEL=y
  CONFIG_CRYPTO_SM4_GENERIC=y
  CONFIG_AMT=m
 +CONFIG_VXLAN=m
+ CONFIG_IP_SCTP=m