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 9A1BD1B904 for ; Fri, 14 Dec 2018 19:24:41 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C570B23E6DE; Fri, 14 Dec 2018 18:24:40 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4076600C1; Fri, 14 Dec 2018 18:24:35 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Neil Horman , dpdk stable Date: Fri, 14 Dec 2018 18:24:03 +0000 Message-Id: <20181214182430.11593-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 14 Dec 2018 18:24:40 +0000 (UTC) Subject: [dpdk-stable] patch 'devtools: fix symbol check when adding experimental section' has been queued to stable 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, 14 Dec 2018 18:24:42 -0000 Hi, FYI, your patch has been queued to stable 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 12/18/18. 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 3b0f329479187f01187215eec0d4d6ff6f7f0f1b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 30 Nov 2018 13:32:02 +0100 Subject: [PATCH] devtools: fix symbol check when adding experimental section [ upstream commit b0aa225b45e102a1eba2215e3a75b5683d8435f2 ] The incriminated commit did relax the condition to catch all sections but dropped the + removal which can trigger false detection of the special EXPERIMENTAL section when adding symbols and the section in the same patch. Fixes: 7281cf520f89 ("devtools: relax rule for identifying symbol section") Signed-off-by: David Marchand Acked-by: Neil Horman --- devtools/check-symbol-change.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh index 1d21e9165..8f986a5d7 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -32,4 +32,5 @@ build_map_changes() # symbol rule below /^.*{/ { + gsub("+", ""); if (in_map == 1) { sec=$(NF-1); in_sec=1; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-12-14 18:23:18.239787836 +0000 +++ 0001-devtools-fix-symbol-check-when-adding-experimental-s.patch 2018-12-14 18:23:18.000000000 +0000 @@ -1,15 +1,16 @@ -From b0aa225b45e102a1eba2215e3a75b5683d8435f2 Mon Sep 17 00:00:00 2001 +From 3b0f329479187f01187215eec0d4d6ff6f7f0f1b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 30 Nov 2018 13:32:02 +0100 Subject: [PATCH] devtools: fix symbol check when adding experimental section +[ upstream commit b0aa225b45e102a1eba2215e3a75b5683d8435f2 ] + The incriminated commit did relax the condition to catch all sections but dropped the + removal which can trigger false detection of the special EXPERIMENTAL section when adding symbols and the section in the same patch. Fixes: 7281cf520f89 ("devtools: relax rule for identifying symbol section") -Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Neil Horman @@ -18,7 +19,7 @@ 1 file changed, 1 insertion(+) diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh -index 4b8d9f3c7..020da7ed0 100755 +index 1d21e9165..8f986a5d7 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -32,4 +32,5 @@ build_map_changes()