patch 'test/member: fix build with clang 15' has been queued to stable release 21.11.3

Kevin Traynor ktraynor at redhat.com
Wed Nov 23 19:04:03 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.11.3

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/28/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/ca0952588a26631a81b3412ae33bbfff21bb0aab

Thanks.

Kevin

---
>From ca0952588a26631a81b3412ae33bbfff21bb0aab Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 18 Nov 2022 09:53:12 +0100
Subject: [PATCH] test/member: fix build with clang 15

[ upstream commit 8f8ed0c1f7f20d821eba41f51243e805b66e2579 ]

This local variable hides the more global one.
The original intent was probably to use the global one.

Fixes: 0cc67a96e486 ("test/member: add functional and perf tests")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
 app/test/test_member.c      | 1 -
 app/test/test_member_perf.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/test/test_member.c b/app/test/test_member.c
index af9d50915c..bb9b0228df 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -546,5 +546,4 @@ setup_keys_and_data(void)
 
 		/* Sift through the list of keys and look for duplicates */
-		int num_duplicates = 0;
 		for (i = 0; i < MAX_ENTRIES - 1; i++) {
 			if (memcmp(generated_keys[i], generated_keys[i + 1],
diff --git a/app/test/test_member_perf.c b/app/test/test_member_perf.c
index e2840f12d3..a312401992 100644
--- a/app/test/test_member_perf.c
+++ b/app/test/test_member_perf.c
@@ -151,5 +151,4 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
 
 		/* Sift through the list of keys and look for duplicates */
-		int num_duplicates = 0;
 		for (i = 0; i < KEYS_TO_ADD - 1; i++) {
 			if (memcmp(keys[i], keys[i + 1],
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.229101847 +0000
+++ 0050-test-member-fix-build-with-clang-15.patch	2022-11-23 09:55:57.101149388 +0000
@@ -1 +1 @@
-From 8f8ed0c1f7f20d821eba41f51243e805b66e2579 Mon Sep 17 00:00:00 2001
+From ca0952588a26631a81b3412ae33bbfff21bb0aab Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f8ed0c1f7f20d821eba41f51243e805b66e2579 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index c1b6a7d8b9..4a93f8bff4 100644
+index af9d50915c..bb9b0228df 100644
@@ -23 +24 @@
-@@ -574,5 +574,4 @@ setup_keys_and_data(void)
+@@ -546,5 +546,4 @@ setup_keys_and_data(void)
@@ -30 +31 @@
-index 7b6adf913e..2f79888fbd 100644
+index e2840f12d3..a312401992 100644
@@ -33 +34 @@
-@@ -179,5 +179,4 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
+@@ -151,5 +151,4 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,



More information about the stable mailing list