From: Matthieu Baerts <matttbe@kernel.org>
To: gregkh@linuxfoundation.org, geliang@kernel.org, kuba@kernel.org,
tanggeliang@kylinos.cn
Cc: stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] mptcp: remove duplicate sk_reset_timer call" failed to apply to 5.10-stable tree
Date: Fri, 22 Aug 2025 16:01:40 +0200 [thread overview]
Message-ID: <dcc3a8ed-3e5c-4225-9c34-18f242bce818@kernel.org> (raw)
In-Reply-To: <2025082231-attempt-trickily-0b68@gregkh>
Hello,
On 22/08/2025 08:04, gregkh@linuxfoundation.org wrote:
>
> The patch below does not apply to the 5.10-stable tree.
Thank you for the notification!
(...)
> From 5d13349472ac8abcbcb94407969aa0fdc2e1f1be Mon Sep 17 00:00:00 2001
> From: Geliang Tang <geliang@kernel.org>
> Date: Fri, 15 Aug 2025 19:28:22 +0200
> Subject: [PATCH] mptcp: remove duplicate sk_reset_timer call
>
> sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list.
>
> Simplify the code by using a 'goto' statement to eliminate the
> duplication.
>
> Note that this is not a fix, but it will help backporting the following
> patch. The same "Fixes" tag has been added for this reason.
>
> Fixes: 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")
Sorry, I should have updated the "Fixes" tag: this patch is only needed
for trees having commit 304ab97f4c7c ("mptcp: allow ADD_ADDR reissuance
by userspace PMs"), so v5.19+.
So this patch is not needed in v5.10.
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
prev parent reply other threads:[~2025-08-22 14:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-22 6:04 FAILED: patch "[PATCH] mptcp: remove duplicate sk_reset_timer call" failed to apply to 5.10-stable tree gregkh
2025-08-22 14:01 ` Matthieu Baerts [this message]
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=dcc3a8ed-3e5c-4225-9c34-18f242bce818@kernel.org \
--to=matttbe@kernel.org \
--cc=geliang@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tanggeliang@kylinos.cn \
/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