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 C33E7A00C2 for ; Wed, 23 Nov 2022 19:05:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BEE5642DA3; Wed, 23 Nov 2022 19:05:27 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 433D840E5A for ; Wed, 23 Nov 2022 19:05:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NV3RbBo9EerZkQpZMxcEq+wzUq1DX463IHp0JQR5JCs=; b=iH8zmAoIBvabY065ePuT5Boa46aoWTpdm1efES9TaojiwcjaWTT+BDY9y6YAWFXGM2NFO0 WMETIOetMXI8rJf+ls1zHt2VBaSdDUkzczFefz9kRGmpT7yp8AIKeooWZdmywQLgkVUprI y1BthUJhDTGvwWF+SVENuBvlvgkn2Io= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-363-q-Q6ETqgPYyXWUJNA03CWg-1; Wed, 23 Nov 2022 13:05:22 -0500 X-MC-Unique: q-Q6ETqgPYyXWUJNA03CWg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3B10185A794; Wed, 23 Nov 2022 18:05:19 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44D13492B0B; Wed, 23 Nov 2022 18:05:19 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Tyler Retzlaff , dpdk stable Subject: patch 'test/member: fix build with clang 15' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:04:03 +0000 Message-Id: <20221123180413.733554-50-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 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 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 Acked-by: Tyler Retzlaff --- 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@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,