mptcp: fix recent failed backports (20250822)
Status from this message: This is a note to let you know that I've just added the patch titled
Get series with b4
b4 am [email protected]Versions newest first
Patches in v1 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | mptcp: remove duplicate sk_reset_timer callnet/ | +2 | 1 reply | |
| 2/3 | mptcp: disable add_addr retransmission when timeout is 0Documentation/ net/ | +12 | 1 reply | |
| 3/3 | selftests: mptcp: pm: check flush doesn't reset limitstools/ | +1 | 1 reply |
Reviews trailers per patch
All 3 patches have a Reviewed-by or Acked-by.
| Patch | Matthieu Baerts (NGI0) | Mat Martineau |
|---|---|---|
| 1/3 | R-b R-b | |
| 2/3 | R-b R-b | |
| 3/3 | R-b R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH 6.6.y 0/3] 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")
- 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(-)
Signature · 1 line
2.50.0