[dpdk-stable] patch 'net/octeontx/base: fix debug build with clang' has been queued to stable release 19.11.10

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.10

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 69180666f1d05bc858f3651cb2619790a5807543 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 9 Jul 2021 11:32:29 +0530
Subject: [PATCH] net/octeontx/base: fix debug build with clang

[ upstream commit 5898abedeb847590ce3cf800e907c5035866e09b ]

Remove conflicting declaration of this symbol.

Fixes: d0d654986018 ("net/octeontx: support event Rx adapter")

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 drivers/net/octeontx/base/octeontx_pkivf.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/octeontx/base/octeontx_pkivf.h b/drivers/net/octeontx/base/octeontx_pkivf.h
index d541dc3bd9..ae5ffadf49 100644
--- a/drivers/net/octeontx/base/octeontx_pkivf.h
+++ b/drivers/net/octeontx/base/octeontx_pkivf.h
@@ -346,7 +346,6 @@ int octeontx_pki_port_open(int port);
 int octeontx_pki_port_hash_config(int port, pki_hash_cfg_t *hash_cfg);
 int octeontx_pki_port_pktbuf_config(int port, pki_pktbuf_cfg_t *buf_cfg);
 int octeontx_pki_port_create_qos(int port, pki_qos_cfg_t *qos_cfg);
-int octeontx_pki_port_close(int port);
 int octeontx_pki_port_errchk_config(int port, pki_errchk_cfg_t *cfg);
 
 #endif /* __OCTEONTX_PKI_H__ */
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:15.330757172 +0200
+++ 0059-net-octeontx-base-fix-debug-build-with-clang.patch	2021-08-10 15:11:13.054638359 +0200
@@ -1 +1 @@
-From 5898abedeb847590ce3cf800e907c5035866e09b Mon Sep 17 00:00:00 2001
+From 69180666f1d05bc858f3651cb2619790a5807543 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5898abedeb847590ce3cf800e907c5035866e09b ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
-index d41eaa57ed..8c86841ea6 100644
+index d541dc3bd9..ae5ffadf49 100644
@@ -20 +21 @@
-@@ -362,7 +362,6 @@ int octeontx_pki_port_open(int port);
+@@ -346,7 +346,6 @@ int octeontx_pki_port_open(int port);
@@ -26,2 +27,2 @@
- int octeontx_pki_port_vlan_fltr_config(int port,
- 				pki_port_vlan_filter_config_t *fltr_cfg);
+ 
+ #endif /* __OCTEONTX_PKI_H__ */