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 85A7BA0524 for ; Thu, 4 Feb 2021 12:36:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7911924075A; Thu, 4 Feb 2021 12:36:39 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 8D695240734 for ; Thu, 4 Feb 2021 12:36:37 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cw7-0005VH-LX; Thu, 04 Feb 2021 11:36:35 +0000 From: Christian Ehrhardt To: Bruce Richardson Cc: David Marchand , dpdk stable Date: Thu, 4 Feb 2021 12:28:51 +0100 Message-Id: <20210204112954.2488123-76-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: fix reciprocal header include' has been queued to stable release 19.11.7 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 02/06/21. 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/a2758e749ca4932a38dfeb4de0058a2f8884ba8c Thanks. Christian Ehrhardt --- >From a2758e749ca4932a38dfeb4de0058a2f8884ba8c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 Jan 2021 11:10:33 +0000 Subject: [PATCH] eal: fix reciprocal header include [ upstream commit 8fc617099ec28e4690e460461f8872ae7b50e86a ] The rte_reciprocal header file used standard __rte_always_inline from rte_common.h but does not include that header file, leading to compiler errors when the reciprocal header is included alone. Fixes: 6d45659eacb8 ("eal: add u64-bit variant for reciprocal divide") Signed-off-by: Bruce Richardson Reviewed-by: David Marchand --- lib/librte_eal/common/include/rte_reciprocal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_eal/common/include/rte_reciprocal.h b/lib/librte_eal/common/include/rte_reciprocal.h index 63e16fde0a..735adb029b 100644 --- a/lib/librte_eal/common/include/rte_reciprocal.h +++ b/lib/librte_eal/common/include/rte_reciprocal.h @@ -27,6 +27,8 @@ #include +#include + struct rte_reciprocal { uint32_t m; uint8_t sh1, sh2; -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:31.228676860 +0100 +++ 0076-eal-fix-reciprocal-header-include.patch 2021-02-04 12:04:28.074789772 +0100 @@ -1 +1 @@ -From 8fc617099ec28e4690e460461f8872ae7b50e86a Mon Sep 17 00:00:00 2001 +From a2758e749ca4932a38dfeb4de0058a2f8884ba8c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8fc617099ec28e4690e460461f8872ae7b50e86a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/librte_eal/include/rte_reciprocal.h | 2 ++ + lib/librte_eal/common/include/rte_reciprocal.h | 2 ++ @@ -19 +20 @@ -diff --git a/lib/librte_eal/include/rte_reciprocal.h b/lib/librte_eal/include/rte_reciprocal.h +diff --git a/lib/librte_eal/common/include/rte_reciprocal.h b/lib/librte_eal/common/include/rte_reciprocal.h @@ -21,2 +22,2 @@ ---- a/lib/librte_eal/include/rte_reciprocal.h -+++ b/lib/librte_eal/include/rte_reciprocal.h +--- a/lib/librte_eal/common/include/rte_reciprocal.h ++++ b/lib/librte_eal/common/include/rte_reciprocal.h