Skip to content

mptcp: fix recent failed backports (20260919)

Matthieu Baerts (NGI0) mptcp stable 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 1 replyIn review
  2. v13 patches 3 repliesApplied

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3mptcp: avoid unneeded actions on subflow resetnet/mptcp/protocol.c net/mptcp/protocol.h net/mptcp/subflow.c+16 -40 replies
2/3mptcp: close race between scheduler and state changenet/mptcp/protocol.c+3 -10 replies
3/3mptcp: fix bad accounting in __mptcp_subflow_push_pending()net/mptcp/protocol.c+2 -10 replies

Reviews trailers per patch

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

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

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

Read the v2 thread

Cover letter [PATCH 6.12.y v2 0/3] 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()")

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

v2: Drop these two patches that have been already backported to this
version, but git didn't complain about that. Instead, resolve a small conflict in patch 1 ("mptcp: avoid unneeded actions on subflow reset"): decrement the '__unused' variable.

Paolo Abeni (3):
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 |  3 ++-
 net/mptcp/subflow.c  | 11 +++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)
Signature · 1 line
2.55.0