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

Cross-merge networking fixes after downstream PR (net-6.18-rc7).

No conflicts, adjacent changes:

tools/testing/selftests/net/af_unix/Makefile
  e1bb28bf13f4 ("selftest: af_unix: Add test for SO_PEEK_OFF.")
  45a1cd8346ca ("selftests: af_unix: Add tests for ECONNRESET and EOF semantics")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/airoha/airoha_ppe.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ptp.c
Simple merge

diff --cc drivers/net/ethernet/intel/idpf/idpf_main.c
Simple merge

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

diff --cc drivers/net/veth.c
Simple merge

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

diff --cc kernel/bpf/helpers.c
Simple merge

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

diff --cc net/l2tp/l2tp_core.c
Simple merge

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

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

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

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

diff --cc net/unix/af_unix.c
Simple merge

diff --cc net/vmw_vsock/af_vsock.c
Simple merge

diff --cc tools/testing/selftests/bpf/config
Simple merge

diff --cc tools/testing/selftests/bpf/test_kmods/bpf_testmod.c
Simple merge

diff --cc tools/testing/selftests/net/.gitignore
Simple merge

diff --cc tools/testing/selftests/net/af_unix/Makefile
index 5826a83,528d14c..3cd677b
--- 1/tools/testing/selftests/net/af_unix/Makefile
--- 2/tools/testing/selftests/net/af_unix/Makefile
+++ b/tools/testing/selftests/net/af_unix/Makefile
@@@ -6,8 -6,8 +6,9 @@@ TEST_GEN_PROGS := 
        scm_inq \
        scm_pidfd \
        scm_rights \
+       so_peek_off \
        unix_connect \
 +      unix_connreset \
  # end of TEST_GEN_PROGS
  
  include ../../lib.mk

diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh
Simple merge