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