[dpdk-stable] patch 'crypto/null: 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/4e74b260f890dc2070c093ef5f991e9985fadc55

Thanks.

Kevin.

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

[ upstream commit 2ce24ee7acccd68f3a8e736b67808c33f4902a46 ]

'null_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: 735b783d8c2b ("crypto/null: add dynamic logging")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/crypto/null/null_crypto_pmd.c         | 1 +
 drivers/crypto/null/null_crypto_pmd_private.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c
index 6e29a21a6..1af5da674 100644
--- a/drivers/crypto/null/null_crypto_pmd.c
+++ b/drivers/crypto/null/null_crypto_pmd.c
@@ -11,4 +11,5 @@
 
 static uint8_t cryptodev_driver_id;
+int null_logtype_driver;
 
 /** verify and set session parameters */
diff --git a/drivers/crypto/null/null_crypto_pmd_private.h b/drivers/crypto/null/null_crypto_pmd_private.h
index d5905afd8..ae34ce667 100644
--- a/drivers/crypto/null/null_crypto_pmd_private.h
+++ b/drivers/crypto/null/null_crypto_pmd_private.h
@@ -9,5 +9,5 @@
 /**< Null crypto PMD device name */
 
-int null_logtype_driver;
+extern int null_logtype_driver;
 
 #define NULL_LOG(level, fmt, ...)  \
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:40.167616835 +0000
+++ 0016-crypto-null-fix-global-variable-multiple-definitions.patch	2019-12-10 14:49:39.005458644 +0000
@@ -1 +1 @@
-From 2ce24ee7acccd68f3a8e736b67808c33f4902a46 Mon Sep 17 00:00:00 2001
+From 4e74b260f890dc2070c093ef5f991e9985fadc55 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2ce24ee7acccd68f3a8e736b67808c33f4902a46 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index d5e3064f2..f11636c5f 100644
+index 6e29a21a6..1af5da674 100644
@@ -32 +33 @@
-index d7bfd9cc8..89c4345b6 100644
+index d5905afd8..ae34ce667 100644