From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA1BA246777 for ; Sun, 24 Aug 2025 07:15:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756019722; cv=none; b=jUwwmEsS3m/W+fxstxI8RQVSHNhhwbI+ISo+OiajQNbBl5TfKQl1ZMFf+yw1ZjgK3HiINBv5J9KGIO7mnbIsW5jOiY07z0Lo8FzD5AYhf4iboklj4JpChnwoXz1TnDqmbkIGffPGvvM3XGYYx+VazytEZLuoCV899noVJU/caNs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756019722; c=relaxed/simple; bh=7N/HHraWMbReoAgRWgm19kvSzjTiSiBvJQjRTHIIvhQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=eD2iTsIO09MIn7myh9n2NZOJxYVMf3jbg80PEGAYwC+i+1S9p3P4Phe+UWbMuoHtzyeIZn0lxEUZRY53saX572xCYL+qV8jhrUt1+sV/5CMr/3i8orqftAPWc6PEneClYc+Skaz8eXZQjM8BJpUPNfUMjnXVyWTrwE5K40efSMY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YIi5NMDE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YIi5NMDE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F04C7C4CEEB; Sun, 24 Aug 2025 07:15:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756019721; bh=7N/HHraWMbReoAgRWgm19kvSzjTiSiBvJQjRTHIIvhQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YIi5NMDE/TA9GcYww+fHgyHyf7irSv1ZMiuJMEDRgbjgCc1cAoQ4aXkX0cJDIzoWa d7rb7Te3gD1nSHR6vlLIWCU48FqYtcJJRkucG1OsyM0FJt5suqgog72dRgKd5cw9Jr swwM1oac0N1BYVYSKpifU6qQU4EbFHvmJioj1gy8= Date: Sun, 24 Aug 2025 09:15:18 +0200 From: Greg KH To: Matthieu Baerts Cc: Sasha Levin , stable@vger.kernel.org, Geliang Tang , Geliang Tang , Jakub Kicinski Subject: Re: [PATCH 6.1.y] mptcp: remove duplicate sk_reset_timer call Message-ID: <2025082408-ascent-transfer-2883@gregkh> References: <2025082230-overlay-latitude-1a75@gregkh> <20250823143406.2247894-1-sashal@kernel.org> <2025082442-relatable-obstinate-7f10@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Sun, Aug 24, 2025 at 09:08:06AM +0200, Matthieu Baerts wrote: > Hi Greg, Sasha, > > 24 Aug 2025 09:02:56 Greg KH : > > > On Sat, Aug 23, 2025 at 10:34:06AM -0400, Sasha Levin wrote: > >> From: Geliang Tang > >> > >> [ Upstream commit 5d13349472ac8abcbcb94407969aa0fdc2e1f1be ] > >> > >> 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") > >> Cc: stable@vger.kernel.org > >> Signed-off-by: Geliang Tang > >> Reviewed-by: Matthieu Baerts (NGI0) > >> Signed-off-by: Matthieu Baerts (NGI0) > >> Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org > >> Signed-off-by: Jakub Kicinski > >> [ adjusted function location from pm.c to pm_netlink.c ] > >> Signed-off-by: Sasha Levin > >> --- > >> net/mptcp/pm_netlink.c | 5 ++--- > >> 1 file changed, 2 insertions(+), 3 deletions(-) > > > > Didn't apply cleanly :( > > I don't know if it is the reason, but I sent the same patches on Friday: > > https://lore.kernel.org/20250822141124.49727-5-matttbe@kernel.org/T And it didn't apply either? I'm confused...