Skip to content

mptcp: fix recent failed backports (20250822)

Matthieu Baerts (NGI0) mptcp stable 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2mptcp: remove duplicate sk_reset_timer callnet/mptcp/pm_netlink.c+2 -30 replies
2/2mptcp: disable add_addr retransmission when timeout is 0Documentation/networking/mptcp-sysctl.rst net/mptcp/pm_netlink.c+12 -30 replies

Reviews trailers per patch

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

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

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

Read the v1 thread

Cover letter [PATCH 6.12.y 0/2] mptcp: fix recent failed backports (20250822)

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

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

 Documentation/networking/mptcp-sysctl.rst |  2 ++
 net/mptcp/pm_netlink.c                    | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
Signature · 1 line
2.50.0