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 27363A0524 for ; Thu, 4 Feb 2021 12:37:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2240824078E; Thu, 4 Feb 2021 12:37:25 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id EC5BD240784 for ; Thu, 4 Feb 2021 12:37:23 +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 1l7cws-0005fH-N1; Thu, 04 Feb 2021 11:37:22 +0000 From: Christian Ehrhardt To: Bruce Richardson Cc: Honnappa Nagarahalli , dpdk stable Date: Thu, 4 Feb 2021 12:29:13 +0100 Message-Id: <20210204112954.2488123-98-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 MCS lock 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/7dd28f7f71f2048c3349684543e202a67c13e349 Thanks. Christian Ehrhardt --- >From 7dd28f7f71f2048c3349684543e202a67c13e349 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 29 Jan 2021 16:48:15 +0000 Subject: [PATCH] eal: fix MCS lock header include [ upstream commit 3c2cca6a0da17c83716522084357731ab053172e ] Include 'rte_branch_prediction.h' to get the likely/unlikely macro definitions. Fixes: 2173f3333b61 ("mcslock: add MCS queued lock implementation") Signed-off-by: Bruce Richardson Reviewed-by: Honnappa Nagarahalli --- lib/librte_eal/common/include/generic/rte_mcslock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_eal/common/include/generic/rte_mcslock.h b/lib/librte_eal/common/include/generic/rte_mcslock.h index ce553f5475..896dfbf10f 100644 --- a/lib/librte_eal/common/include/generic/rte_mcslock.h +++ b/lib/librte_eal/common/include/generic/rte_mcslock.h @@ -22,6 +22,7 @@ #include #include #include +#include /** * The rte_mcslock_t type. -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:32.075740278 +0100 +++ 0098-eal-fix-MCS-lock-header-include.patch 2021-02-04 12:04:28.106789802 +0100 @@ -1 +1 @@ -From 3c2cca6a0da17c83716522084357731ab053172e Mon Sep 17 00:00:00 2001 +From 7dd28f7f71f2048c3349684543e202a67c13e349 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3c2cca6a0da17c83716522084357731ab053172e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/librte_eal/include/generic/rte_mcslock.h | 1 + + lib/librte_eal/common/include/generic/rte_mcslock.h | 1 + @@ -18,4 +19,4 @@ -diff --git a/lib/librte_eal/include/generic/rte_mcslock.h b/lib/librte_eal/include/generic/rte_mcslock.h -index d370bef17a..9f323bd2a2 100644 ---- a/lib/librte_eal/include/generic/rte_mcslock.h -+++ b/lib/librte_eal/include/generic/rte_mcslock.h +diff --git a/lib/librte_eal/common/include/generic/rte_mcslock.h b/lib/librte_eal/common/include/generic/rte_mcslock.h +index ce553f5475..896dfbf10f 100644 +--- a/lib/librte_eal/common/include/generic/rte_mcslock.h ++++ b/lib/librte_eal/common/include/generic/rte_mcslock.h