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 A97A1A0032 for ; Fri, 18 Feb 2022 13:44:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A419840395; Fri, 18 Feb 2022 13:44:36 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id CA3D140E2D for ; Fri, 18 Feb 2022 13:44:35 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id m27so2596057wrb.4 for ; Fri, 18 Feb 2022 04:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5g0GMRd0/rFMrE5+K9tKY5t//Nb1l6PKtPxrsPn09G8=; b=MbLHjvcd27XDbK8f6Sn1dIgi8v3MK8EoqdKzTr1qfVaK72rJBcXHKE7eV/05tZ+O85 DFN0EPq/SX3HwY36vBAH6AXi865cGWzLiK5Bz2lMoh4mEd63Xpu7ONRVvjXPN06E4FI/ k1tqQsKsZxVBbEwducVJIY86T2GiULqt8DydnUKUtyQSuRHDxYiQJE9Z4VqrYf3D5fVb oqRyHhYrbYvHxwDKO0K3TbOIZd5/dz8C1TrK5Frkm+YaQ8aFRsl1+PRZV0KIBXGJGFQ1 VmuNo9/Syq3/2LKxKQztsylVdKzueCKMjaOdCMeADKYgvqLrmUXnWNHPeH9mlyO/eGuw bvZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5g0GMRd0/rFMrE5+K9tKY5t//Nb1l6PKtPxrsPn09G8=; b=wkaNfFkIvceYx/i/iNNs0wdT3ZRQJHRwByrS+lk69bRTnqbt+REZxohx6Qyn7fQwe1 hs/tnRayqAcsVfHup9Fg3y7r33kGVkecSzGCNldrQr64JbWw3f5Mm+GEg8s5pMuFgKcz 3hqQf+FOp8i9Dce903pBgbXAzz6ZwWJz/eCEXuS8YBCclBz396Wyds8Jn1SNoozZbmCk YC75az5hJ01arFPPhL3uQMSKCBPsxzi8Svp/4PUIQj4JUWkBbXsp2W99pwWU8hbCaoyo flfZetlqq1V1zdz/Dq7f3Pm4H0eSUTRr+2wOix3ZikBNxtGRlmdU3r6kz2SbXeIb6tQ9 Ucxg== X-Gm-Message-State: AOAM531Y642Bwnl0bPKrOLVcCox2STqQaoGON9Mawt+zeqIxUQXvoxjV j8fTf9BFUBnjWbGWh+ew+PJWsHr9OBbd2OI3 X-Google-Smtp-Source: ABdhPJyVKMeObATDCc3Qapz7K+4FWTqPhoL1qRCc7UyQfFW3dZwvxB/QxaAF5lHC0PULOJ2++sQCXA== X-Received: by 2002:a05:6000:1561:b0:1e0:e39c:e990 with SMTP id 1-20020a056000156100b001e0e39ce990mr6008423wrz.134.1645188275496; Fri, 18 Feb 2022 04:44:35 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id ay34sm4042085wmb.29.2022.02.18.04.44.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:35 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: dpdk stable Subject: patch 'stack: fix stubs header export' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:06 +0000 Message-Id: <20220218123931.1749595-97-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7cabaf23be3b854d49c9baf81ddda9c1e9ebfe86 Thanks. Luca Boccassi --- >From 7cabaf23be3b854d49c9baf81ddda9c1e9ebfe86 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 10 Feb 2022 09:55:43 +0100 Subject: [PATCH] stack: fix stubs header export [ upstream commit 8adf5f528bf3321feeae2231007ebae162032739 ] The stubs header is included as part of rte_stack.h for architectures other than x86_64 and aarch64 (i.e. x86 32 bits and ppc). Note: chkincs won't catch this issue since it checks headers from within the source directory. Fixes: 7911ba0473e0 ("stack: enable lock-free implementation for aarch64") Signed-off-by: David Marchand --- lib/librte_stack/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_stack/meson.build b/lib/librte_stack/meson.build index 8f82a40ec2..88ed276d9a 100644 --- a/lib/librte_stack/meson.build +++ b/lib/librte_stack/meson.build @@ -6,4 +6,6 @@ headers = files('rte_stack.h', 'rte_stack_std.h', 'rte_stack_lf.h', 'rte_stack_lf_generic.h', - 'rte_stack_lf_c11.h') + 'rte_stack_lf_c11.h', + 'rte_stack_lf_stubs.h', +) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.578757127 +0000 +++ 0097-stack-fix-stubs-header-export.patch 2022-02-18 12:37:37.826794957 +0000 @@ -1 +1 @@ -From 8adf5f528bf3321feeae2231007ebae162032739 Mon Sep 17 00:00:00 2001 +From 7cabaf23be3b854d49c9baf81ddda9c1e9ebfe86 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8adf5f528bf3321feeae2231007ebae162032739 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - lib/stack/meson.build | 1 + - 1 file changed, 1 insertion(+) + lib/librte_stack/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) @@ -20,10 +21,12 @@ -diff --git a/lib/stack/meson.build b/lib/stack/meson.build -index 2f53f49677..18177a742f 100644 ---- a/lib/stack/meson.build -+++ b/lib/stack/meson.build -@@ -9,4 +9,5 @@ indirect_headers += files( - 'rte_stack_lf.h', - 'rte_stack_lf_generic.h', - 'rte_stack_lf_c11.h', -+ 'rte_stack_lf_stubs.h', - ) +diff --git a/lib/librte_stack/meson.build b/lib/librte_stack/meson.build +index 8f82a40ec2..88ed276d9a 100644 +--- a/lib/librte_stack/meson.build ++++ b/lib/librte_stack/meson.build +@@ -6,4 +6,6 @@ headers = files('rte_stack.h', + 'rte_stack_std.h', + 'rte_stack_lf.h', + 'rte_stack_lf_generic.h', +- 'rte_stack_lf_c11.h') ++ 'rte_stack_lf_c11.h', ++ 'rte_stack_lf_stubs.h', ++)