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

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

- 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 (1): 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 | 13 ++++++++++--- tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 + 3 files changed, 13 insertions(+), 3 deletions(-)