From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, stable@vger.kernel.org,
gregkh@linuxfoundation.org
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, sashal@kernel.org
Subject: [PATCH 6.6.y 0/3] mptcp: fix recent failed backports (20250822)
Date: Fri, 22 Aug 2025 16:11:00 +0200 [thread overview]
Message-ID: <20250822141059.48927-5-matttbe@kernel.org> (raw)
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
next reply other threads:[~2025-08-22 14:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-22 14:11 Matthieu Baerts (NGI0) [this message]
2025-08-22 14:11 ` [PATCH 6.6.y 1/3] mptcp: remove duplicate sk_reset_timer call Matthieu Baerts (NGI0)
2025-08-23 14:53 ` Patch "mptcp: remove duplicate sk_reset_timer call" has been added to the 6.6-stable tree gregkh
2025-08-22 14:11 ` [PATCH 6.6.y 2/3] mptcp: disable add_addr retransmission when timeout is 0 Matthieu Baerts (NGI0)
2025-08-23 14:53 ` Patch "mptcp: disable add_addr retransmission when timeout is 0" has been added to the 6.6-stable tree gregkh
2025-08-22 14:11 ` [PATCH 6.6.y 3/3] selftests: mptcp: pm: check flush doesn't reset limits Matthieu Baerts (NGI0)
2025-08-23 14:53 ` Patch "selftests: mptcp: pm: check flush doesn't reset limits" has been added to the 6.6-stable tree gregkh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250822141059.48927-5-matttbe@kernel.org \
--to=matttbe@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=mptcp@lists.linux.dev \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox