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 64C333AEB43 for ; Tue, 12 May 2026 14:21:11 +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=1778595671; cv=none; b=WrJQQ/4PFIZ8lbk0wOfE9uvLqoe40WDhWRPxg4Q270jy7tzemReVm/bnMTb56C1b30Jjr7p2LoyuFjGH08GWfTJX+blLybnVagR2KIrnLAIlBBldN89cCgaHjNjZAVhDeg0R6VQgiF1q7+3EdiRIL9Rs8fA1wh0M1Mu+DAoEWpA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595671; c=relaxed/simple; bh=SguYV/4FtU6eXHLDK7luR6rYs3xK88dYBkYSJewNahU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=bQKME9ycDv7u3S0hTbZVpITW3/PmNMwLaD/mzbXTgqA5d1YtUnYXB7aDWxbXEtGn7OUSQsLmr+/EqB88RM05FFHoGmQ+qkiSoThStfa+sBysJ31S64jgU0HRzpvIuVR30/OKJvcyNLTkH8f+3FjqKQN7Ygvc6hZgwPpSzLbOqho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=D65CD9Is; 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="D65CD9Is" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF0EDC2BCB0; Tue, 12 May 2026 14:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595671; bh=SguYV/4FtU6eXHLDK7luR6rYs3xK88dYBkYSJewNahU=; h=Subject:To:Cc:From:Date:From; b=D65CD9Is04T5llHfFGnXnXCwRGOfrzZYA/+7dFvlqJ0pw36J2rnp3f/3Nl7bHi9TH 4WEq2tl4sURD3Ta8zOp8SGhhQFjit9snZlXwdq1IfJgsWtirXOxdQFFFLzW2eYxwdc z3e4V/VEML734W42gjLEvwxVhNe//BUGamLRWfpI= Subject: FAILED: patch "[PATCH] mptcp: pm: ADD_ADDR rtx: allow ID 0" failed to apply to 6.1-stable tree To: matttbe@kernel.org,kuba@kernel.org,martineau@kernel.org Cc: From: Date: Tue, 12 May 2026 16:21:01 +0200 Message-ID: <2026051201-numerator-unmoving-740b@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=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 03f324f3f1f7619a47b9c91282cb12775ab0a2f1 # git commit -s git send-email --to '' --in-reply-to '2026051201-numerator-unmoving-740b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 03f324f3f1f7619a47b9c91282cb12775ab0a2f1 Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 5 May 2026 17:00:50 +0200 Subject: [PATCH] mptcp: pm: ADD_ADDR rtx: allow ID 0 ADD_ADDR can be sent for the ID 0, which corresponds to the local address and port linked to the initial subflow. Indeed, this address could be removed, and re-added later on, e.g. what is done in the "delete re-add signal" MPTCP Join selftests. So no reason to ignore it. Fixes: 00cfd77b9063 ("mptcp: retransmit ADD_ADDR when timeout") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-2-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 57a456690406..5056eb8db24e 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -337,9 +337,6 @@ static void mptcp_pm_add_timer(struct timer_list *timer) if (inet_sk_state_load(sk) == TCP_CLOSE) return; - if (!entry->addr.id) - return; - if (mptcp_pm_should_add_signal_addr(msk)) { sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX / 8); goto out;