From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 1 Jun 2023 22:33:03 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: microblaze-v6.6~166^2~189
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=a03a91bd68cb00c615e602cf605e6be12bedaa90;p=linux-2.6-microblaze.git

Merge git://git./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>
---

a03a91bd68cb00c615e602cf605e6be12bedaa90
diff --cc drivers/net/ethernet/sfc/tc.c
index 6dfbdb39f2fe,c004443c1d58..bb9ec1e761d3
--- a/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,