[dpdk-stable] patch 'eal: fix MCS lock and ticketlock headers install' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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/11/20. 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/af1fc63d2e3c1634355415d2c73aadfa82b89e0b

Thanks.

Luca Boccassi

---
>From af1fc63d2e3c1634355415d2c73aadfa82b89e0b Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz at 6wind.com>
Date: Wed, 4 Nov 2020 18:03:33 +0100
Subject: [PATCH] eal: fix MCS lock and ticketlock headers install

[ upstream commit f8e90bcc1d407a191435cffb1b6b5b0a8ff01c92 ]

Add missing arch-specific headers in meson.build.

Fixes: 2173f3333b61 ("mcslock: add MCS queued lock implementation")
Fixes: ca49b92079df ("ticketlock: enable generic ticketlock on all arch")

Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
Acked-by: David Marchand <david.marchand at redhat.com>
Acked-by: David Christensen <drc at linux.vnet.ibm.com>
Acked-by: Ruifeng Wang <ruifeng.wang at arm.com>
---
 lib/librte_eal/common/include/arch/arm/meson.build    | 2 ++
 lib/librte_eal/common/include/arch/ppc_64/meson.build | 2 ++
 lib/librte_eal/common/include/arch/x86/meson.build    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/lib/librte_eal/common/include/arch/arm/meson.build b/lib/librte_eal/common/include/arch/arm/meson.build
index 77893fa359..faa3d84f67 100644
--- a/lib/librte_eal/common/include/arch/arm/meson.build
+++ b/lib/librte_eal/common/include/arch/arm/meson.build
@@ -14,6 +14,7 @@ install_headers(
 	'rte_cycles.h',
 	'rte_io_64.h',
 	'rte_io.h',
+	'rte_mcslock.h',
 	'rte_memcpy_32.h',
 	'rte_memcpy_64.h',
 	'rte_memcpy.h',
@@ -25,5 +26,6 @@ install_headers(
 	'rte_prefetch.h',
 	'rte_rwlock.h',
 	'rte_spinlock.h',
+	'rte_ticketlock.h',
 	'rte_vect.h',
 	subdir: get_option('include_subdir_arch'))
diff --git a/lib/librte_eal/common/include/arch/ppc_64/meson.build b/lib/librte_eal/common/include/arch/ppc_64/meson.build
index 7949c86258..5d3ebafa26 100644
--- a/lib/librte_eal/common/include/arch/ppc_64/meson.build
+++ b/lib/librte_eal/common/include/arch/ppc_64/meson.build
@@ -8,10 +8,12 @@ install_headers(
 	'rte_cpuflags.h',
 	'rte_cycles.h',
 	'rte_io.h',
+	'rte_mcslock.h',
 	'rte_memcpy.h',
 	'rte_pause.h',
 	'rte_prefetch.h',
 	'rte_rwlock.h',
 	'rte_spinlock.h',
+	'rte_ticketlock.h',
 	'rte_vect.h',
 	subdir: get_option('include_subdir_arch'))
diff --git a/lib/librte_eal/common/include/arch/x86/meson.build b/lib/librte_eal/common/include/arch/x86/meson.build
index bc8ffea1ee..806cfad042 100644
--- a/lib/librte_eal/common/include/arch/x86/meson.build
+++ b/lib/librte_eal/common/include/arch/x86/meson.build
@@ -11,11 +11,13 @@ install_headers(
 	'rte_cpuflags.h',
 	'rte_cycles.h',
 	'rte_io.h',
+	'rte_mcslock.h',
 	'rte_memcpy.h',
 	'rte_prefetch.h',
 	'rte_pause.h',
 	'rte_rtm.h',
 	'rte_rwlock.h',
 	'rte_spinlock.h',
+	'rte_ticketlock.h',
 	'rte_vect.h',
 	subdir: get_option('include_subdir_arch'))
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:49:40.610209615 +0000
+++ 0001-eal-fix-MCS-lock-and-ticketlock-headers-install.patch	2020-11-09 18:49:40.572079346 +0000
@@ -1 +1 @@
-From f8e90bcc1d407a191435cffb1b6b5b0a8ff01c92 Mon Sep 17 00:00:00 2001
+From af1fc63d2e3c1634355415d2c73aadfa82b89e0b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f8e90bcc1d407a191435cffb1b6b5b0a8ff01c92 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -17,3 +18,3 @@
- lib/librte_eal/arm/include/meson.build | 2 ++
- lib/librte_eal/ppc/include/meson.build | 2 ++
- lib/librte_eal/x86/include/meson.build | 2 ++
+ lib/librte_eal/common/include/arch/arm/meson.build    | 2 ++
+ lib/librte_eal/common/include/arch/ppc_64/meson.build | 2 ++
+ lib/librte_eal/common/include/arch/x86/meson.build    | 2 ++
@@ -22,5 +23,5 @@
-diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
-index c6a9f70d73..770766de1a 100644
---- a/lib/librte_eal/arm/include/meson.build
-+++ b/lib/librte_eal/arm/include/meson.build
-@@ -14,6 +14,7 @@ arch_headers = files(
+diff --git a/lib/librte_eal/common/include/arch/arm/meson.build b/lib/librte_eal/common/include/arch/arm/meson.build
+index 77893fa359..faa3d84f67 100644
+--- a/lib/librte_eal/common/include/arch/arm/meson.build
++++ b/lib/librte_eal/common/include/arch/arm/meson.build
+@@ -14,6 +14,7 @@ install_headers(
@@ -34 +35 @@
-@@ -26,6 +27,7 @@ arch_headers = files(
+@@ -25,5 +26,6 @@ install_headers(
@@ -40,7 +41,6 @@
- )
- install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
-diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
-index 0873b2aecb..dae40ede54 100644
---- a/lib/librte_eal/ppc/include/meson.build
-+++ b/lib/librte_eal/ppc/include/meson.build
-@@ -8,12 +8,14 @@ arch_headers = files(
+ 	subdir: get_option('include_subdir_arch'))
+diff --git a/lib/librte_eal/common/include/arch/ppc_64/meson.build b/lib/librte_eal/common/include/arch/ppc_64/meson.build
+index 7949c86258..5d3ebafa26 100644
+--- a/lib/librte_eal/common/include/arch/ppc_64/meson.build
++++ b/lib/librte_eal/common/include/arch/ppc_64/meson.build
+@@ -8,10 +8,12 @@ install_headers(
@@ -53 +52,0 @@
- 	'rte_power_intrinsics.h',
@@ -59,7 +58,6 @@
- )
- install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
-diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
-index 091fb647dc..549cc21a42 100644
---- a/lib/librte_eal/x86/include/meson.build
-+++ b/lib/librte_eal/x86/include/meson.build
-@@ -11,6 +11,7 @@ arch_headers = files(
+ 	subdir: get_option('include_subdir_arch'))
+diff --git a/lib/librte_eal/common/include/arch/x86/meson.build b/lib/librte_eal/common/include/arch/x86/meson.build
+index bc8ffea1ee..806cfad042 100644
+--- a/lib/librte_eal/common/include/arch/x86/meson.build
++++ b/lib/librte_eal/common/include/arch/x86/meson.build
+@@ -11,11 +11,13 @@ install_headers(
@@ -70,0 +69 @@
+ 	'rte_prefetch.h',
@@ -72,2 +70,0 @@
- 	'rte_power_intrinsics.h',
-@@ -18,6 +19,7 @@ arch_headers = files(
@@ -79,2 +76 @@
- )
- install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
+ 	subdir: get_option('include_subdir_arch'))