[dpdk-stable] patch 'regex/octeontx2: remove unused include directory' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/14/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/8ff559890ac52a01c83fd98a3f6b04acf0aec68d

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 8ff559890ac52a01c83fd98a3f6b04acf0aec68d Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Mon, 3 May 2021 16:45:33 +0200
Subject: [PATCH] regex/octeontx2: remove unused include directory
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 486cc30399879f0ab006d095e03ad193ab18f2f4 ]

The variable inc_dir is not defined in this file.

Fixes: 4cd1c5fd9ed4 ("regex/octeontx2: introduce REE driver")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Guy Kaneti <guyk at marvell.com>
---
 drivers/regex/octeontx2/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/regex/octeontx2/meson.build b/drivers/regex/octeontx2/meson.build
index 34e51728c2..c42d83d549 100644
--- a/drivers/regex/octeontx2/meson.build
+++ b/drivers/regex/octeontx2/meson.build
@@ -12,7 +12,6 @@ lib = cc.find_library('librxp_compiler', required: false)
 if lib.found()
 	ext_deps += lib
 	ext_deps += cc.find_library('libstdc++', required: true)
-	includes += include_directories(inc_dir)
 	cflags += ['-DREE_COMPILER_SDK']
 endif
 
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:58.688754000 +0800
+++ 0081-regex-octeontx2-remove-unused-include-directory.patch	2021-06-12 06:53:56.380000000 +0800
@@ -1 +1 @@
-From 486cc30399879f0ab006d095e03ad193ab18f2f4 Mon Sep 17 00:00:00 2001
+From 8ff559890ac52a01c83fd98a3f6b04acf0aec68d Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 486cc30399879f0ab006d095e03ad193ab18f2f4 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index 4930ce00f4..3f81add5bf 100644
+index 34e51728c2..c42d83d549 100644
@@ -23,4 +25,4 @@
-     ext_deps += lib
-     ext_deps += cc.find_library('libstdc++', required: true)
--    includes += include_directories(inc_dir)
-     cflags += ['-DREE_COMPILER_SDK']
+ 	ext_deps += lib
+ 	ext_deps += cc.find_library('libstdc++', required: true)
+-	includes += include_directories(inc_dir)
+ 	cflags += ['-DREE_COMPILER_SDK']