[dpdk-stable] patch 'bus/fslmc: 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/0616dbe473eba350c00fda7187cbc57a985eeb84

Thanks.

Kevin.

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

[ upstream commit dc111b5e068172c48f9a19987700cc44cadb6d6b ]

'qman_version' 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: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Sachin Saxena <sachin.saxena at nxp.com>
---
 drivers/bus/fslmc/qbman/qbman_portal.c | 2 ++
 drivers/bus/fslmc/qbman/qbman_portal.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c
index bbea37efc..a954307bb 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.c
+++ b/drivers/bus/fslmc/qbman/qbman_portal.c
@@ -62,4 +62,6 @@ enum qbman_sdqcr_fc {
 static struct qbman_swp *portal_idx_map[MAX_QBMAN_PORTALS];
 
+uint32_t qman_version;
+
 /* Internal Function declaration */
 static int
diff --git a/drivers/bus/fslmc/qbman/qbman_portal.h b/drivers/bus/fslmc/qbman/qbman_portal.h
index 3b0fc540b..628da3ef8 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.h
+++ b/drivers/bus/fslmc/qbman/qbman_portal.h
@@ -12,5 +12,5 @@
 #include <fsl_qbman_portal.h>
 
-uint32_t qman_version;
+extern uint32_t qman_version;
 #define QMAN_REV_4000   0x04000000
 #define QMAN_REV_4100   0x04010000
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:40.029762999 +0000
+++ 0014-bus-fslmc-fix-global-variable-multiple-definitions.patch	2019-12-10 14:49:39.001458719 +0000
@@ -1 +1 @@
-From dc111b5e068172c48f9a19987700cc44cadb6d6b Mon Sep 17 00:00:00 2001
+From 0616dbe473eba350c00fda7187cbc57a985eeb84 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dc111b5e068172c48f9a19987700cc44cadb6d6b ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index e6066ce35..12a718117 100644
+index bbea37efc..a954307bb 100644
@@ -34 +35 @@
-index e54f2661c..0e9de8a1b 100644
+index 3b0fc540b..628da3ef8 100644