patch 'app/test: fix reference to master in bonding test' has been queued to stable release 20.11.10

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Oct 19 01:58:56 CEST 2023


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 <stephen at networkplumber.org>
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 <stephen at networkplumber.org>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
 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 at 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();


More information about the stable mailing list