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 CDA001B490 for ; Fri, 4 Jan 2019 14:27:38 +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 3408A7FD4B; Fri, 4 Jan 2019 13:27:38 +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 099435C1A1; Fri, 4 Jan 2019 13:27:36 +0000 (UTC) From: Kevin Traynor To: Arnon Warshavsky Cc: dpdk stable Date: Fri, 4 Jan 2019 13:24:24 +0000 Message-Id: <20190104132455.15170-42-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.27]); Fri, 04 Jan 2019 13:27:38 +0000 (UTC) Subject: [dpdk-stable] patch 'devtools: fix return of forbidden addition checks' 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:39 -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 c8d23d7b9743b7518d0ed09b20f1f0e5ff5c4a80 Mon Sep 17 00:00:00 2001 From: Arnon Warshavsky Date: Tue, 18 Dec 2018 17:19:00 +0200 Subject: [PATCH] devtools: fix return of forbidden addition checks [ upstream commit dafc04c15174e84ca04a7f4ebe67b10c059a5c0c ] Explicitly collect the error code of the multiple awk script calls. Bugzilla ID: 165 Fixes: 4d4c612e6a30 ("devtools: check wrong svg include in guides") Signed-off-by: Arnon Warshavsky --- devtools/checkpatches.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index ee8debecf..3b03b7ef2 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -45,4 +45,6 @@ print_usage () { check_forbidden_additions() { # + res=0 + # refrain from new additions of rte_panic() and rte_exit() # multiple folders and expressions are separated by spaces @@ -52,5 +54,6 @@ check_forbidden_additions() { # -v MESSAGE='Using rte_panic/rte_exit' \ -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \ - "$1" + "$1" || res=1 + # svg figures must be included with wildcard extension # because of png conversion for pdf docs @@ -60,5 +63,7 @@ check_forbidden_additions() { # -v MESSAGE='Using explicit .svg extension instead of .*' \ -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \ - "$1" + "$1" || res = 1 + + return $res } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:08.452380475 +0000 +++ 0042-devtools-fix-return-of-forbidden-addition-checks.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,13 +1,14 @@ -From dafc04c15174e84ca04a7f4ebe67b10c059a5c0c Mon Sep 17 00:00:00 2001 +From c8d23d7b9743b7518d0ed09b20f1f0e5ff5c4a80 Mon Sep 17 00:00:00 2001 From: Arnon Warshavsky Date: Tue, 18 Dec 2018 17:19:00 +0200 Subject: [PATCH] devtools: fix return of forbidden addition checks +[ upstream commit dafc04c15174e84ca04a7f4ebe67b10c059a5c0c ] + Explicitly collect the error code of the multiple awk script calls. Bugzilla ID: 165 Fixes: 4d4c612e6a30 ("devtools: check wrong svg include in guides") -Cc: stable@dpdk.org Signed-off-by: Arnon Warshavsky ---