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

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

Matthieu Baerts (NGI0) posted 4 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/pm.c       | 41 +++++++++++++++++++++++++++--------------
net/mptcp/protocol.c | 15 +++++++++------
net/mptcp/protocol.h | 10 +++++++---
net/mptcp/subflow.c  | 11 +++++++++++
4 files changed, 54 insertions(+), 23 deletions(-)

Expand all Fold all

[PATCH 6.18.y 0/4] 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 commit to avoid conflicts:

- 6cafe51e0f98 ("mptcp: move the stale logic out of retrans scheduler")

Paolo Abeni (4):
  mptcp: move the stale logic out of retrans scheduler
  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/pm.c       | 41 +++++++++++++++++++++++++++--------------
 net/mptcp/protocol.c | 15 +++++++++------
 net/mptcp/protocol.h | 10 +++++++---
 net/mptcp/subflow.c  | 11 +++++++++++
 4 files changed, 54 insertions(+), 23 deletions(-)

-- 
2.55.0