From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 439B54319F for ; Thu, 19 Oct 2023 01:59:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B1AD4029E; Thu, 19 Oct 2023 01:59:58 +0200 (CEST) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by mails.dpdk.org (Postfix) with ESMTP id C9B6940A72 for ; Thu, 19 Oct 2023 01:59:56 +0200 (CEST) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2c509f2c46cso78785851fa.1 for ; Wed, 18 Oct 2023 16:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673596; x=1698278396; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KC9U87ehhe+NpJhpDXBl6JW+QzNqP3XNC6CZ9ebGueI=; b=YKgerkshjvHlMRXXy8dkgbAxzkqIu+fgPplKItQwrZlNwyoZzy2HLWR3OSghkmA4Ol 7dGq4hzHh9FydxZAtk8VORg4wNrqX4OEKh+3ibCE3Qc0ZSUA4u34mWtWagAU7wEXSy/9 gS/uqMWy3CrBpjjb28yG0JVGS7HG+RV5tH2FcYsXAxNOOxqz4DR74CurgLt7m+WgaBXI cmwWTPOVkOjtwZdMg/cxb7J6KWKTlNWM2uufpR0ZcH/Mc2rPq2dbxFed1T1FyxsrIEbt X84WPbNJkx4xe6t2zieqGnxRidXNNGVqJGaXavYYmf8BTJkaiJh1NQW56UQg/J6NdYUq dT/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673596; x=1698278396; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KC9U87ehhe+NpJhpDXBl6JW+QzNqP3XNC6CZ9ebGueI=; b=f7jbi70oIpen5Xu+SWhyOHBSiYVGXPYrlRp1HCG5SwXCIXz/BEemYNON2zphMdQXPE OJxgrQGQFl0hgkY2FfyY9vqtXfusCsH5uRdSjRcLzy/te1HcRnGT3qxQN1t/KCErpJZQ CvibJAHXmlViYYRxPzBSfigtLEHo7sk3bpz61y04K7NSsZ2kt44fAAHeUbLPDxboAr0g L4eREDKZ6LdpeRh5LK/bBCH3PhiexzHjOYh1b2K6wZSjK43kkkG3RXA6J9KNri3v6oOS lHAy7cOeIWjK05mm1q4Y0XcHSd27KUfnkvNRf+EkiLTxjHDtQ/kTF7hYf7+mJJgJ72rj Vh/A== X-Gm-Message-State: AOJu0YyFcU4gR8GOR8oDP1reVJnEdjLsRmqn2iVAO4PBqjb3LcPn4SCG RDd3PyJXdRqq/uCcfE6JtZXN/A8I7JDAlA== X-Google-Smtp-Source: AGHT+IGzdsf2B9SEl6ES6fHzagEdS4l0DqMYY8W5vKvyRW7GxZ9sAVYsJYIkLLMcMCjThBrF+yITXA== X-Received: by 2002:a2e:9883:0:b0:2c0:2ab7:9ab1 with SMTP id b3-20020a2e9883000000b002c02ab79ab1mr227958ljj.35.1697673595889; Wed, 18 Oct 2023 16:59:55 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id g11-20020a05600c310b00b003fe1fe56202sm2976624wmo.33.2023.10.18.16.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 16:59:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Tyler Retzlaff , dpdk stable Subject: patch 'app/test: fix reference to master in bonding test' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:58:56 +0100 Message-Id: <20231018235930.3144-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/dfc299e6c105d83bb809923f02c77eb8b02fae0c Thanks. Luca Boccassi --- >From dfc299e6c105d83bb809923f02c77eb8b02fae0c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 17 Aug 2023 19:44:48 -0700 Subject: [PATCH] app/test: fix reference to master in bonding test [ upstream commit 61b52e7edb3a764699f0d392f298fca34d56c11d ] Fixes: 0c8396e6d786 ("bond: unit tests for mode 5") Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- app/test/test_link_bonding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c index 824b0acf15..4f810efb0a 100644 --- a/app/test/test_link_bonding.c +++ b/app/test/test_link_bonding.c @@ -4262,7 +4262,7 @@ test_tlb_tx_burst(void) burst_size); TEST_ASSERT_EQUAL(nb_tx, 0, " bad number of packet in burst"); - /* Clean ugit checkout masterp and remove slaves from bonded device */ + /* Clean up and remove members from bonding device */ return remove_slaves_and_stop_bonded_device(); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:56.606833453 +0100 +++ 0007-app-test-fix-reference-to-master-in-bonding-test.patch 2023-10-19 00:28:56.197803992 +0100 @@ -1 +1 @@ -From 61b52e7edb3a764699f0d392f298fca34d56c11d Mon Sep 17 00:00:00 2001 +From dfc299e6c105d83bb809923f02c77eb8b02fae0c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 61b52e7edb3a764699f0d392f298fca34d56c11d ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ -index f0050fa29a..4d715c4465 100644 +index 824b0acf15..4f810efb0a 100644 @@ -19 +20 @@ -@@ -4306,7 +4306,7 @@ test_tlb_tx_burst(void) +@@ -4262,7 +4262,7 @@ test_tlb_tx_burst(void) @@ -23 +24 @@ -- /* Clean ugit checkout masterp and remove members from bonding device */ +- /* Clean ugit checkout masterp and remove slaves from bonded device */ @@ -25 +26 @@ - return remove_members_and_stop_bonding_device(); + return remove_slaves_and_stop_bonded_device();