Re: FAILED: patch "[PATCH] mptcp: remove duplicate sk_reset_timer call" failed to apply to 5.15-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Fri, Aug 22, 2025 at 04:01:34PM +0200, Matthieu Baerts wrote:
> Hello,
> 
> On 22/08/2025 08:04, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 5.15-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.15.

Thanks for letting us know on this, and the other one.

greg k-h