[dpdk-stable] patch 'eal: fix detection of duplicate option register' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/11/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.

Thanks.

Kevin Traynor

---
>From 58ef03c41f94cefb2747660a5431cc717fe95f90 Mon Sep 17 00:00:00 2001
From: Gaetan Rivet <gaetan.rivet at 6wind.com>
Date: Mon, 17 Dec 2018 10:25:59 +0100
Subject: [PATCH] eal: fix detection of duplicate option register

[ upstream commit c9b413c3b1cfb52740acb2a0fbf1b73acdb93646 ]

Missing brackets around the if means that the loop will end at
its first iteration.

Fixes: 2395332798d0 ("eal: add option register infrastructure")

Signed-off-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/common/rte_option.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/rte_option.c b/lib/librte_eal/common/rte_option.c
index 7605190c3..088e0fd23 100644
--- a/lib/librte_eal/common/rte_option.c
+++ b/lib/librte_eal/common/rte_option.c
@@ -36,8 +36,9 @@ rte_option_register(struct rte_option *opt)
 {
 	TAILQ_FOREACH(option, &rte_option_list, next) {
-		if (strcmp(opt->opt_str, option->opt_str) == 0)
+		if (strcmp(opt->opt_str, option->opt_str) == 0) {
 			RTE_LOG(INFO, EAL, "Option %s has already been registered.\n",
 					opt->opt_str);
 			return;
+		}
 	}
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-04 13:23:08.096129625 +0000
+++ 0027-eal-fix-detection-of-duplicate-option-register.patch	2019-01-04 13:23:07.000000000 +0000
@@ -1,13 +1,14 @@
-From c9b413c3b1cfb52740acb2a0fbf1b73acdb93646 Mon Sep 17 00:00:00 2001
+From 58ef03c41f94cefb2747660a5431cc717fe95f90 Mon Sep 17 00:00:00 2001
 From: Gaetan Rivet <gaetan.rivet at 6wind.com>
 Date: Mon, 17 Dec 2018 10:25:59 +0100
 Subject: [PATCH] eal: fix detection of duplicate option register
 
+[ upstream commit c9b413c3b1cfb52740acb2a0fbf1b73acdb93646 ]
+
 Missing brackets around the if means that the loop will end at
 its first iteration.
 
 Fixes: 2395332798d0 ("eal: add option register infrastructure")
-Cc: stable at dpdk.org
 
 Signed-off-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
 Reviewed-by: Anatoly Burakov <anatoly.burakov at intel.com>