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 A3B1AA0542 for ; Thu, 24 Nov 2022 15:01:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A9CC42DC9; Thu, 24 Nov 2022 15:01:01 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id A8AB942DBF for ; Thu, 24 Nov 2022 15:00:59 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id DC7413F221 for ; Thu, 24 Nov 2022 14:00:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1669298458; bh=PMnwHqv6pU01X82FXwRApsdZRVoaRxgWY5G0SqrrSsE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Fa55Ni4+rkGeTt8mGSdko/4DtvyEgc7yM96lKEDO4qr2G6BLLZ7a9spsntF5Rxc4k rPUcNhe/UxaF+UPMJsv0QOm0zLJT5lNGTEl0W6poDAxXC6+adQb8ym4NGAWkwKX7U/ 6q2H/is8i9l/jeOCyocOw2GkS0OACjZmMCX6UjD7yiIyz8oQ0Gj/BMNbGUs+ZpTlpR DZss96eC44J/6s6Xz3QlDc9wusbAvKR7UlBSW0hiMu6J3i/Jc8xrA+8eiNmnL4NFFp oL12jj2wA417LNfOKvIhJ8g42rQy7+SoUpxmfGnNIMu+hliEhJ3w4EC6FqmjMGgMQ6 dwGqZ8hV8S6jA== Received: by mail-ed1-f72.google.com with SMTP id c9-20020a05640227c900b00463de74bc15so997841ede.13 for ; Thu, 24 Nov 2022 06:00:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PMnwHqv6pU01X82FXwRApsdZRVoaRxgWY5G0SqrrSsE=; b=B4OzOlgj/Ts6+RpjiHrjhcgZwaqYiwbFHBjyWDKz5poq9JAklXgCZE861L0R/CmlXR JZP7t4tFQflqOmFYlCBe382vcSw/4zhoKt8Akn9LkdPIEA0wEljk+mqhGjVfC8hcz16N DfWYz1EREVfRUGg8Z9nu0QYP3a4v5zfqr9N9ajil0uKga22c/U9lkARCySSTC2DBX4Gj BrM5WaG/GLKDPUF9vOArWtFq3HBZyxuhbo1upwxNYVYq9Auz/jhoLBvBF9NhnMx2joqN VjDfEQrv3Gkcvai+/NZgl4euaG0yyaDSspqBRkehWMyEDX/A1lJqE/Z6dd0m/7xaZIHH VIsw== X-Gm-Message-State: ANoB5pkMwAu8qZ5a3Lwv9txhHk2tM/ENnIMnAdWGP8EQJmicktu20zTw mLY0TAdwAYLF6fcXC2zN0yvZGh1Dc+73PI6ve6x/xaxQAML+dn6J6gJQT7gYf8nMlG5YRW0WZuU ymxrbSyRWahZnAjhZFGp4xdfA X-Received: by 2002:a17:906:35c8:b0:78d:3a04:e41d with SMTP id p8-20020a17090635c800b0078d3a04e41dmr28821152ejb.39.1669298457736; Thu, 24 Nov 2022 06:00:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf4lS/QgRGBzqtuk57W+rR6RyMI10zUrGdgrJcF2yxzCSRz5vQWYGjkMrHfD7RZ4jcbpRvfXbw== X-Received: by 2002:a17:906:35c8:b0:78d:3a04:e41d with SMTP id p8-20020a17090635c800b0078d3a04e41dmr28821132ejb.39.1669298457476; Thu, 24 Nov 2022 06:00:57 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39e5:dd00:978:e124:4bf:b342]) by smtp.gmail.com with ESMTPSA id u17-20020aa7d0d1000000b004617e880f52sm544478edo.29.2022.11.24.06.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 06:00:57 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Tyler Retzlaff , dpdk stable 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 Message-Id: <20221124140034.770192-7-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221124140034.770192-1-christian.ehrhardt@canonical.com> References: <20221124140034.770192-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 --- >From 9abff6b0e65a32547e7eed700f21974c2f27a9f0 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 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,