From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BB1CCA0093 for ; Thu, 28 May 2020 18:24:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B2F4E1D996; Thu, 28 May 2020 18:24:52 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 6288C1D996 for ; Thu, 28 May 2020 18:24:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YzpzuTu8+tc/b8Tm4+ESBKf2xELiNvfmMTXODz3Hrts=; b=etrFqq7GvgVM1zREtchX6XRXnNMlnWzP7FQwgxqh2L4EZMQmqBRWFXqeECgV6lBMvAi/c0 pds1xRH7hKx/SzcTo89EWN+ouMp4bgzUzSRfYMHTOVR9lVBjooofjfeJboBe4wctmLX+ty ejTC1NgyKim44CYytp9QuJ6aR3vAVUI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-3k06ta9gOP2_Jd1wyOAo4A-1; Thu, 28 May 2020 12:24:47 -0400 X-MC-Unique: 3k06ta9gOP2_Jd1wyOAo4A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5674107ACCA; Thu, 28 May 2020 16:24:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 445A360C05; Thu, 28 May 2020 16:24:42 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: David Marchand , Neil Horman , Jerin Jacob , dpdk stable Date: Thu, 28 May 2020 17:22:09 +0100 Message-Id: <20200528162322.7863-22-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'devtools: fix symbol map change check' has been queued to LTS release 18.11.9 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/58dfa26fe2aaf88f7fb5429ee1f21e4230e61922 Thanks. Kevin. --- >From 58dfa26fe2aaf88f7fb5429ee1f21e4230e61922 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Mon, 23 Mar 2020 17:26:13 +0530 Subject: [PATCH] devtools: fix symbol map change check [ upstream commit f08885494f241b115ad66763b585fbfb486d5160 ] Fix check symbol change script to detect new diff file when it is in between "--- /dev/null" to "b/lib/...". Current awk line expects line to start with "a/..." which is not always true for all diffs. As a result if in_map was '1' earlier, it will not be changed to '0' and we get check patch errors which are not true. Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") Signed-off-by: David Marchand Signed-off-by: Nithin Dabilpuram Acked-by: Neil Horman Tested-by: Jerin Jacob --- devtools/check-symbol-change.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh index f6f79a883b..2d4f05fdd2 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -18,11 +18,9 @@ build_map_changes() # appearing between a triggering of this rule and the # next trigger of this rule are associated with this file - /[-+] a\/.*\.map/ {map=$2; in_map=1} + /[-+] [ab]\/.*\.map/ {map=$2; in_map=1; next} - # Same pattern as above, only it matches on anything that - # does not end in 'map', indicating we have left the map chunk. - # When we hit this, turn off the in_map variable, which - # supresses the subordonate rules below - /[-+] a\/.*\.[^map]/ {in_map=0} + # The previous rule catches all .map files, anything else + # indicates we left the map chunk. + /[-+] [ab]\// {in_map=0} # Triggering this rule, which starts a line and ends it -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:00.320678360 +0100 +++ 0022-devtools-fix-symbol-map-change-check.patch 2020-05-28 17:12:59.081556853 +0100 @@ -1 +1 @@ -From f08885494f241b115ad66763b585fbfb486d5160 Mon Sep 17 00:00:00 2001 +From 58dfa26fe2aaf88f7fb5429ee1f21e4230e61922 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f08885494f241b115ad66763b585fbfb486d5160 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index c5434f3bb0..ed2178e36e 100755 +index f6f79a883b..2d4f05fdd2 100755