Skip to content
Commit a03a91bd authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files


Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

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

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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4ff3dfc9 714069da
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment