Skip to content

mptcp: fix recent failed backports (20260919)

Matthieu Baerts (NGI0) mptcp sashiko-reviews stable 1 version Applied

Status from this message: This is a note to let you know that I've just added the patch titled

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 7 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/5mptcp: annotate data-races around subflow->fully_establishednet/mptcp/options.c net/mptcp/protocol.c net/mptcp/protocol.h+4 -44 replies
2/5mptcp: remove unneeded READ_ONCE() annotationnet/mptcp/options.c net/mptcp/protocol.c+3 -30 replies
3/5mptcp: avoid unneeded actions on subflow resetnet/mptcp/protocol.c net/mptcp/protocol.h net/mptcp/subflow.c+16 -41 reply
4/5mptcp: close race between scheduler and state changenet/mptcp/protocol.c+3 -11 reply
5/5mptcp: fix bad accounting in __mptcp_subflow_push_pending()net/mptcp/protocol.c+2 -11 reply

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by.

PatchMatthieu Baerts (NGI0)
1/5R-b R-b
2/5R-b
3/5R-b R-b
4/5R-b R-b
5/5R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 6.12.y 0/5] mptcp: fix recent failed backports (20260919)

The following patches could not be applied without conflicts in this tree:

- 2b0f561f21b2 ("mptcp: avoid unneeded actions on subflow reset")
- 42064de57fb8 ("mptcp: close race between scheduler and state change")
- f3ef03357396 ("mptcp: fix bad accounting in __mptcp_subflow_push_pending()")

I backported the following commits to avoid conflicts:

- 581c8cbfa934 ("mptcp: annotate data-races around subflow->fully_established")
- caa4a79f74f3 ("mptcp: remove unneeded READ_ONCE() annotation")

Conflicts (if any) have been resolved, and documented in each patch.

Gang Yan (1):
mptcp: annotate data-races around subflow->fully_established

Paolo Abeni (4):
mptcp: remove unneeded READ_ONCE() annotation
mptcp: avoid unneeded actions on subflow reset
mptcp: close race between scheduler and state change
mptcp: fix bad accounting in __mptcp_subflow_push_pending()

 net/mptcp/protocol.c | 13 ++++++++-----
 net/mptcp/protocol.h |  1 +
 net/mptcp/subflow.c  | 11 +++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)
Signature · 1 line
2.55.0