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

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=b6200f6581b14b5de9759e4df3f858d822dfd7d5

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From b6200f6581b14b5de9759e4df3f858d822dfd7d5 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 2f46e4c6ee..d74e2f5fca 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -4261,7 +4261,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.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-10-22 22:17:35.012067000 +0800
+++ 0015-app-test-fix-reference-to-master-in-bonding-test.patch	2023-10-22 22:17:34.146723700 +0800
@@ -1 +1 @@
-From 61b52e7edb3a764699f0d392f298fca34d56c11d Mon Sep 17 00:00:00 2001
+From b6200f6581b14b5de9759e4df3f858d822dfd7d5 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 61b52e7edb3a764699f0d392f298fca34d56c11d ]
@@ -7 +9,0 @@
-Cc: stable at dpdk.org
@@ -16 +18 @@
-index f0050fa29a..4d715c4465 100644
+index 2f46e4c6ee..d74e2f5fca 100644
@@ -19 +21 @@
-@@ -4306,7 +4306,7 @@ test_tlb_tx_burst(void)
+@@ -4261,7 +4261,7 @@ test_tlb_tx_burst(void)
@@ -23 +25 @@
--	/* Clean ugit checkout masterp and remove members from bonding device */
+-	/* Clean ugit checkout masterp and remove slaves from bonded device */
@@ -25 +27 @@
- 	return remove_members_and_stop_bonding_device();
+ 	return remove_slaves_and_stop_bonded_device();