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

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

Matthieu Baerts (NGI0) posted 3 patches 3 weeks, 5 days ago

Diff against v1 v1 v1
Download series mbox

Failed in applying to current master (apply log)

There is a newer version of this series

Documentation/networking/mptcp-sysctl.rst      |  2 ++
net/mptcp/pm_netlink.c                         | 18 ++++++++++++------
.../testing/selftests/net/mptcp/pm_netlink.sh  |  1 +
3 files changed, 15 insertions(+), 6 deletions(-)

Expand all Fold all

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

Posted by Matthieu Baerts (NGI0) 3 weeks, 5 days ago

Greg recently reported the following patches could not be applied
without conflicts in this tree:

 - 5d13349472ac ("mptcp: remove duplicate sk_reset_timer call")
 - f5ce0714623c ("mptcp: disable add_addr retransmission when timeout is 0")
 - 452690be7de2 ("selftests: mptcp: pm: check flush doesn't reset limits")

Conflicts have been resolved, and documented in each patch.

Geliang Tang (2):
  mptcp: remove duplicate sk_reset_timer call
  mptcp: disable add_addr retransmission when timeout is 0

Matthieu Baerts (NGI0) (1):
  selftests: mptcp: pm: check flush doesn't reset limits

 Documentation/networking/mptcp-sysctl.rst      |  2 ++
 net/mptcp/pm_netlink.c                         | 18 ++++++++++++------
 .../testing/selftests/net/mptcp/pm_netlink.sh  |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

-- 
2.50.0