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 45CEDA06CB for ; Tue, 22 Nov 2022 23:03:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4225542D84; Tue, 22 Nov 2022 23:03:11 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 644C742B77 for ; Tue, 22 Nov 2022 23:03:09 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id o30so11859257wms.2 for ; Tue, 22 Nov 2022 14:03:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/BnUBx5mu4NOIPsZGLM39/0oNXYqHAOUg6MrVbmQAGo=; b=Nd34p9Nvx8+sdYPmSkN79nEDsnmvKBvzYXX3hVGMSQvDfriY/9Kda8IEcliMCAcLMg QUO82jR8ouGweIt7MMY52J8UUjR70SE5p1wvy7D42JLiltGPQ1p9yK2xnO/vk5pgDR6A 4vRL5dAIVO0mbO0izZAKGKJK5yHvsf5dG5L78VQcp3pCEn1tAlpmaQbL5syayNB9n4Lx 7mDEjQJw8ssADEuh6AyvX97qN0blk/c+Jd8W0JM8ZdFZ8bhk3YyapxhdFCI1/+Dtb92c 8GizKnfOLOEzfPd/YZJoTrdCXQQ/s6luplaSbZZmVJZhGlfrc3baFOxQL8SJk9fmCGsy MGvw== 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=/BnUBx5mu4NOIPsZGLM39/0oNXYqHAOUg6MrVbmQAGo=; b=Jxf2rlFblZ4ZTKmZjpYXzWZkg08vWR1EBtfOWIkONBwwyIp6v4DMBulyA4OVK8919N q0pJjRNuaHvpsLXsAcwNSFClURdxpuB3qs8pSwR6S5I1xCb862O1pnwUMVyraZTW0hHg UCyj62E0N4M9AWe5nmk33kajvxIrQ7fhSVUw6mCu+SWjzfX6IRfY8JtRt1R7uN/9v1fW vNqjvPFq1sZEFBL8quEGx/FVGT/wtOc00qtxAROkZHB3kGPfxeVYFgUFtIOqE4uYdIun +THWLZ3eVjGcQDx8oEuU7eN1gv/Vz/DisO8JF3wz32XWRkBD8VhUI3i2vyLFsEdJk5kx Kfbw== X-Gm-Message-State: ANoB5pmZkwubs9pD52txOLTdtmMHQ1nXnYk6zLKMsNJd81im2usWi/be yRsVbU5yXKH6OdGDuIvnw4Q= X-Google-Smtp-Source: AA0mqf6LsPmzWnFAA0i+JsAMw3HEeT1FuTqPXLPPX0R2scLXdWPVhNf6eQk39xGdutfCwQ/EloEShQ== X-Received: by 2002:a1c:2b81:0:b0:3b4:88ba:a74c with SMTP id r123-20020a1c2b81000000b003b488baa74cmr4122646wmr.77.1669154589048; Tue, 22 Nov 2022 14:03:09 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id l35-20020a05600c1d2300b003cf878c4468sm135997wms.5.2022.11.22.14.03.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 14:03:08 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Tyler Retzlaff , dpdk stable Subject: patch 'test/member: fix build with clang 15' has been queued to stable release 20.11.7 Date: Tue, 22 Nov 2022 22:02:32 +0000 Message-Id: <20221122220241.926784-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122220241.926784-1-luca.boccassi@gmail.com> References: <20221117230859.611465-34-luca.boccassi@gmail.com> <20221122220241.926784-1-luca.boccassi@gmail.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 20.11.7 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/24/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/89baaef40e6a301bcd658d41a0b21c09ab4a202c Thanks. Luca Boccassi --- >From 89baaef40e6a301bcd658d41a0b21c09ab4a202c 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 @@ -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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-22 22:01:32.053217072 +0000 +++ 0008-test-member-fix-build-with-clang-15.patch 2022-11-22 22:01:31.491524342 +0000 @@ -1 +1 @@ -From 8f8ed0c1f7f20d821eba41f51243e805b66e2579 Mon Sep 17 00:00:00 2001 +From 89baaef40e6a301bcd658d41a0b21c09ab4a202c 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 @@ -@@ -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,