[dpdk-stable] patch 'compress/octeontx: fix global variable multiple definitions' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 12/16/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b72c96fde5bb413bfccbaa17335d6964cdf54503

Thanks.

Kevin.

---
>From b72c96fde5bb413bfccbaa17335d6964cdf54503 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Thu, 5 Sep 2019 15:53:12 +0100
Subject: [PATCH] compress/octeontx: fix global variable multiple definitions

[ upstream commit 4d6194db01f51169181c0af6e6dc5fed042265ad ]

'octtx_zip_logtype_driver' global variable is defined in a header file
which was causing multiple definitions of the variable, fixed it by
moving it to the .c file.

Issue has been detected by '-fno-common' gcc flag.

Fixes: 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Ashish Gupta <ashishg at marvell.com>
---
 drivers/compress/octeontx/otx_zip.h     | 2 +-
 drivers/compress/octeontx/otx_zip_pmd.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/compress/octeontx/otx_zip.h b/drivers/compress/octeontx/otx_zip.h
index 3abefd1dc..e43f7f5c3 100644
--- a/drivers/compress/octeontx/otx_zip.h
+++ b/drivers/compress/octeontx/otx_zip.h
@@ -18,5 +18,5 @@
 #include <zip_regs.h>
 
-int octtx_zip_logtype_driver;
+extern int octtx_zip_logtype_driver;
 
 /* ZIP VF Control/Status registers (CSRs): */
diff --git a/drivers/compress/octeontx/otx_zip_pmd.c b/drivers/compress/octeontx/otx_zip_pmd.c
index a1651b22e..9e00c8663 100644
--- a/drivers/compress/octeontx/otx_zip_pmd.c
+++ b/drivers/compress/octeontx/otx_zip_pmd.c
@@ -12,4 +12,6 @@
 #include "otx_zip.h"
 
+int octtx_zip_logtype_driver;
+
 static const struct rte_compressdev_capabilities
 				octtx_zip_pmd_capabilities[] = {
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:40.298120901 +0000
+++ 0018-compress-octeontx-fix-global-variable-multiple-defin.patch	2019-12-10 14:49:39.007458607 +0000
@@ -1 +1 @@
-From 4d6194db01f51169181c0af6e6dc5fed042265ad Mon Sep 17 00:00:00 2001
+From b72c96fde5bb413bfccbaa17335d6964cdf54503 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4d6194db01f51169181c0af6e6dc5fed042265ad ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org