[v1] mptcp: fix recent failed backports (20260919)

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

Matthieu Baerts (NGI0) posted 5 patches 5 days, 13 hours ago

Diff against v1 v1 v1 v1 v1 v1 v2
Download series mbox

Failed in applying to current master (apply log)

There is a newer version of this series

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

Expand all Fold all

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

Posted by Matthieu Baerts (NGI0) 5 days, 13 hours ago

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(-)

-- 
2.55.0