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 B1B13369221 for ; Thu, 20 Nov 2025 16:30:00 +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=1763656201; cv=none; b=Bxwdyldg/zHUQLRSnnddsGHGf3uIcpPC9v7C4JrVqz3Z/bV6n1l49APLLPIpQyaPl/CoV0oPRzhl/w0QPH+UE44veKFsPCWKxDDTdD2epPJF1Lj3FeQZExAu9MiMtcNkDFMWXFviFvkBnXeLSkA1YfBTLkw+PYwyCT0EyBQ4SoI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763656201; c=relaxed/simple; bh=nVnY1gzxuu113fvmQ7oLVjX+dK8lnxNCkIlZgmEXbiE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=QmGpgoX0qxtQWFhDorXN9RTNZFIsdB1/JJkcgF0rpNax4q5pDL50uMUA/5x3yUTKDzJELFTSRuZgLOPY6t4UVMXfnRU6YG757nCYYsJtYak5cGw80+q8/drgCX8BG+HsNwt7dPCcFlaEp1hx03NnSgpuTPpyq9EEIX1e2lTc3R0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Fkeujn92; 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="Fkeujn92" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4CE0C116C6; Thu, 20 Nov 2025 16:29:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1763656200; bh=nVnY1gzxuu113fvmQ7oLVjX+dK8lnxNCkIlZgmEXbiE=; h=Subject:To:Cc:From:Date:From; b=Fkeujn92doT5thS0u53CFDdx6RDKt6Kcz8JPzE/ssL9sayu4YTnMlgjbr1GpUKAey rEeqLiCMnQwBB25tgPib2/RSj1HarDdgiLaVAfA7l556aixyyy6yE3u7qnW+EkKMaf zKxdgwfMdGpQCc3d1L6ecFv0Jyq2nt/qu5v9env4= Subject: FAILED: patch "[PATCH] selftests: mptcp: connect: fix fallback note due to OoO" failed to apply to 6.1-stable tree To: matttbe@kernel.org,geliang@kernel.org,kuba@kernel.org Cc: From: Date: Thu, 20 Nov 2025 17:29:57 +0100 Message-ID: <2025112057-untapped-profile-9004@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 63c643aa7b7287fdbb0167063785f89ece3f000f # git commit -s git send-email --to '' --in-reply-to '2025112057-untapped-profile-9004@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 63c643aa7b7287fdbb0167063785f89ece3f000f Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Mon, 10 Nov 2025 19:23:40 +0100 Subject: [PATCH] selftests: mptcp: connect: fix fallback note due to OoO The "fallback due to TCP OoO" was never printed because the stat_ooo_now variable was checked twice: once in the parent if-statement, and one in the child one. The second condition was then always true then, and the 'else' branch was never taken. The idea is that when there are more ACK + MP_CAPABLE than expected, the test either fails if there was no out of order packets, or a notice is printed. Fixes: 69ca3d29a755 ("mptcp: update selftest for fallback due to OoO") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-1-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh index 47ecb5b3836e..9b7b93f8eb0c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -492,7 +492,7 @@ do_transfer() "than expected (${expect_synrx})" retc=1 fi - if [ ${stat_ackrx_now_l} -lt ${expect_ackrx} ] && [ ${stat_ooo_now} -eq 0 ]; then + if [ ${stat_ackrx_now_l} -lt ${expect_ackrx} ]; then if [ ${stat_ooo_now} -eq 0 ]; then mptcp_lib_pr_fail "lower MPC ACK rx (${stat_ackrx_now_l})" \ "than expected (${expect_ackrx})"