[dpdk-stable] patch 'net/octeontx/base: fix debug build with clang' has been queued to stable release 20.11.3
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Mon Jul 12 15:05:42 CEST 2021
Hi,
FYI, your patch has been queued to stable release 20.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/5a66492539db2de630dc4d977c89edbfbe9ca4af
Thanks.
Luca Boccassi
---
>From 5a66492539db2de630dc4d977c89edbfbe9ca4af 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 d41eaa57ed..8c86841ea6 100644
--- a/drivers/net/octeontx/base/octeontx_pkivf.h
+++ b/drivers/net/octeontx/base/octeontx_pkivf.h
@@ -362,7 +362,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);
int octeontx_pki_port_vlan_fltr_config(int port,
pki_port_vlan_filter_config_t *fltr_cfg);
--
2.30.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-07-12 13:41:42.172657957 +0100
+++ 0107-net-octeontx-base-fix-debug-build-with-clang.patch 2021-07-12 13:41:36.914131443 +0100
@@ -1 +1 @@
-From 5898abedeb847590ce3cf800e907c5035866e09b Mon Sep 17 00:00:00 2001
+From 5a66492539db2de630dc4d977c89edbfbe9ca4af Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5898abedeb847590ce3cf800e907c5035866e09b ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list