[dpdk-stable] patch 'eal: fix MCS lock header include' has been queued to stable release 19.11.7

[Christian Ehrhardt]

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 <christian.ehrhardt at canonical.com>

---
>From 7dd28f7f71f2048c3349684543e202a67c13e349 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
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 <bruce.richardson at intel.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
---
 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 <rte_lcore.h>
 #include <rte_common.h>
 #include <rte_pause.h>
+#include <rte_branch_prediction.h>
 
 /**
  * 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 at 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