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

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

Matthieu Baerts (NGI0) posted 3 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 | 10 ++++++----
net/mptcp/protocol.h |  3 ++-
net/mptcp/subflow.c  | 46 ++++++++++++++++++++++++++++----------------
3 files changed, 37 insertions(+), 22 deletions(-)

Expand all Fold all

[PATCH 6.1.y 0/3] 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")

I backported the following commit to avoid conflicts:

- c3349a22c200 ("mptcp: consolidate subflow cleanup")

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

Paolo Abeni (3):
  mptcp: consolidate subflow cleanup
  mptcp: avoid unneeded actions on subflow reset
  mptcp: close race between scheduler and state change

 net/mptcp/protocol.c | 10 ++++++----
 net/mptcp/protocol.h |  3 ++-
 net/mptcp/subflow.c  | 46 ++++++++++++++++++++++++++++----------------
 3 files changed, 37 insertions(+), 22 deletions(-)

-- 
2.55.0