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

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/sfc/tc.c
  622ab656344a ("sfc: fix error unwinds in TC offload")
  b6583d5e9e94 ("sfc: support TC decap rules matching on enc_src_port")

net/mptcp/protocol.c
  5b825727d087 ("mptcp: add annotations around msk->subflow accesses")
  e76c8ef5cc5b ("mptcp: refactor mptcp_stream_accept()")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

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

diff --cc drivers/net/ethernet/sfc/tc.c
index 6dfbdb3,c004443..bb9ec1e
--- 1/drivers/net/ethernet/sfc/tc.c
--- 2/drivers/net/ethernet/sfc/tc.c
+++ b/drivers/net/ethernet/sfc/tc.c
@@@ -715,10 -650,9 +713,10 @@@ static int efx_tc_flower_replace_foreig
                }
  
                rc = efx_tc_flower_record_encap_match(efx, &match, type,
 +                                                    EFX_TC_EM_DIRECT, 0, 0,
                                                      extack);
                if (rc)
-                       goto release;
+                       return rc;
        } else {
                /* This is not a tunnel decap rule, ignore it */
                netif_dbg(efx, drv, efx->net_dev,

diff --cc include/net/tcp.h
Simple merge

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

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

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

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

diff --cc net/sched/cls_flower.c
Simple merge

diff --cc tools/net/ynl/lib/ynl.py
Simple merge

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