patch 'stack: fix stubs header export' has been queued to stable release 19.11.12

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Fri Feb 25 18:15:37 CET 2022


Hi,

FYI, your patch has been queued to stable release 19.11.12

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/27/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/6578183ebd2725ce4df8c0af502a4d5785694336

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 6578183ebd2725ce4df8c0af502a4d5785694336 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
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 <david.marchand at redhat.com>
---
 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 f420a5c223..ef29dd6959 100644
--- a/lib/librte_stack/meson.build
+++ b/lib/librte_stack/meson.build
@@ -8,4 +8,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.35.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-25 16:58:45.940779961 +0100
+++ 0044-stack-fix-stubs-header-export.patch	2022-02-25 16:58:44.288990455 +0100
@@ -1 +1 @@
-From 8adf5f528bf3321feeae2231007ebae162032739 Mon Sep 17 00:00:00 2001
+From 6578183ebd2725ce4df8c0af502a4d5785694336 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8adf5f528bf3321feeae2231007ebae162032739 ]
+
@@ -13 +14,0 @@
-Cc: stable at 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 f420a5c223..ef29dd6959 100644
+--- a/lib/librte_stack/meson.build
++++ b/lib/librte_stack/meson.build
+@@ -8,4 +8,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',
++)


More information about the stable mailing list