[dpdk-stable] patch 'bus/fslmc: fix warning with GCC 9' has been queued to LTS release 17.11.7

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Thanks.

Yongseok

---
>From 56d6d82a7c0f4128195ea8b4c0c380d6e2d4c360 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 1 May 2019 20:50:12 +0100
Subject: [PATCH] bus/fslmc: fix warning with GCC 9

[ backported from upstream commit 33832c1471e22afaf2e616a7a0325ea9958ce278 ]

Printing a null pointer with %s is flagged as a warning by GCC 9, and
should not be done. Replace the %s with the word "null" itself.

Fixes: 828d51d8fc3e ("bus/fslmc: refactor scan and probe functions")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/bus/fslmc/fslmc_bus.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index b33a01e181..c7930b8691 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -165,8 +165,7 @@ scan_one_fslmc_device(char *dev_name)
 
 	t_ptr = strtok(NULL, ".");
 	if (!t_ptr) {
-		FSLMC_BUS_LOG(ERR, "Incorrect device string observed (%s).",
-			      t_ptr);
+		FSLMC_BUS_LOG(ERR, "Incorrect device string observed (null).")
 		goto cleanup;
 	}
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:11.382804447 -0700
+++ 0091-bus-fslmc-fix-warning-with-GCC-9.patch	2019-07-22 17:55:06.435477000 -0700
@@ -1,29 +1,31 @@
-From 33832c1471e22afaf2e616a7a0325ea9958ce278 Mon Sep 17 00:00:00 2001
+From 56d6d82a7c0f4128195ea8b4c0c380d6e2d4c360 Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Wed, 1 May 2019 20:50:12 +0100
 Subject: [PATCH] bus/fslmc: fix warning with GCC 9
 
+[ backported from upstream commit 33832c1471e22afaf2e616a7a0325ea9958ce278 ]
+
 Printing a null pointer with %s is flagged as a warning by GCC 9, and
 should not be done. Replace the %s with the word "null" itself.
 
 Fixes: 828d51d8fc3e ("bus/fslmc: refactor scan and probe functions")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 ---
- drivers/bus/fslmc/fslmc_bus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ drivers/bus/fslmc/fslmc_bus.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
-index eaa39a2093..f6e66d22c7 100644
+index b33a01e181..c7930b8691 100644
 --- a/drivers/bus/fslmc/fslmc_bus.c
 +++ b/drivers/bus/fslmc/fslmc_bus.c
-@@ -197,7 +197,7 @@ scan_one_fslmc_device(char *dev_name)
+@@ -165,8 +165,7 @@ scan_one_fslmc_device(char *dev_name)
  
  	t_ptr = strtok(NULL, ".");
  	if (!t_ptr) {
--		DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr);
-+		DPAA2_BUS_ERR("Incorrect device string observed (null)");
+-		FSLMC_BUS_LOG(ERR, "Incorrect device string observed (%s).",
+-			      t_ptr);
++		FSLMC_BUS_LOG(ERR, "Incorrect device string observed (null).")
  		goto cleanup;
  	}