patches for DPDK stable branches
 help / color / mirror / Atom feed
From: christian.ehrhardt@canonical.com
To: David Marchand <david.marchand@redhat.com>
Cc: Tyler Retzlaff <roretzla@linux.microsoft.com>,
	dpdk stable <stable@dpdk.org>
Subject: patch 'test/member: fix build with clang 15' has been queued to stable release 19.11.14
Date: Thu, 24 Nov 2022 15:00:30 +0100	[thread overview]
Message-ID: <20221124140034.770192-7-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20221124140034.770192-1-christian.ehrhardt@canonical.com>

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/26/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/9abff6b0e65a32547e7eed700f21974c2f27a9f0

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 9abff6b0e65a32547e7eed700f21974c2f27a9f0 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@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@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@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 748ddcc266..0e3681ab45 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -545,7 +545,6 @@ setup_keys_and_data(void)
 		qsort(generated_keys, MAX_ENTRIES, KEY_SIZE, key_compare);
 
 		/* 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],
 					KEY_SIZE) == 0) {
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
@@ -150,7 +150,6 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
 		qsort(keys, KEYS_TO_ADD, MAX_KEYSIZE, key_compare);
 
 		/* 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],
 					params->key_size) == 0) {
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-24 14:58:13.946661908 +0100
+++ 0007-test-member-fix-build-with-clang-15.patch	2022-11-24 14:58:11.817189526 +0100
@@ -1 +1 @@
-From 8f8ed0c1f7f20d821eba41f51243e805b66e2579 Mon Sep 17 00:00:00 2001
+From 9abff6b0e65a32547e7eed700f21974c2f27a9f0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f8ed0c1f7f20d821eba41f51243e805b66e2579 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index c1b6a7d8b9..4a93f8bff4 100644
+index 748ddcc266..0e3681ab45 100644
@@ -23 +24 @@
-@@ -573,7 +573,6 @@ setup_keys_and_data(void)
+@@ -545,7 +545,6 @@ setup_keys_and_data(void)
@@ -32 +33 @@
-index 7b6adf913e..2f79888fbd 100644
+index e2840f12d3..a312401992 100644
@@ -35 +36 @@
-@@ -178,7 +178,6 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
+@@ -150,7 +150,6 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,

  parent reply	other threads:[~2022-11-24 14:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' " christian.ehrhardt
2022-11-24 14:00 ` patch 'service: fix build with clang 15' " christian.ehrhardt
2022-11-24 14:00 ` patch 'bus/dpaa: " christian.ehrhardt
2022-11-24 14:00 ` patch 'net/atlantic: " christian.ehrhardt
2022-11-24 14:00 ` patch 'app/testpmd: " christian.ehrhardt
2022-11-24 14:00 ` patch 'test/efd: " christian.ehrhardt
2022-11-24 14:00 ` christian.ehrhardt [this message]
2022-11-24 14:00 ` patch 'test/event: " christian.ehrhardt
2022-11-24 14:00 ` patch 'net/ixgbevf: fix promiscuous and allmulti' " christian.ehrhardt
2022-11-24 14:00 ` patch 'doc: add LRO size limitation in mlx5 guide' " christian.ehrhardt
2022-11-24 14:00 ` patch 'doc: fix maximum packet size of virtio driver' " christian.ehrhardt
2022-11-24 14:04 ` patch 'vdpa/ifc: handle data path update failure' " Christian Ehrhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221124140034.770192-7-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=david.marchand@redhat.com \
    --cc=roretzla@linux.microsoft.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).