From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D20761B48B for ; Fri, 4 Jan 2019 14:27:07 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3F40F394D34; Fri, 4 Jan 2019 13:27:07 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2845D5C228; Fri, 4 Jan 2019 13:27:02 +0000 (UTC) From: Kevin Traynor To: Gaetan Rivet Cc: Anatoly Burakov , David Marchand , dpdk stable Date: Fri, 4 Jan 2019 13:24:09 +0000 Message-Id: <20190104132455.15170-27-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 04 Jan 2019 13:27:07 +0000 (UTC) Subject: [dpdk-stable] patch 'eal: fix detection of duplicate option register' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 13:27:08 -0000 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 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 Reviewed-by: Anatoly Burakov Reviewed-by: David Marchand --- 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 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@dpdk.org Signed-off-by: Gaetan Rivet Reviewed-by: Anatoly Burakov