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 8020FA0093 for ; Tue, 19 May 2020 14:59:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 735DE1D5DE; Tue, 19 May 2020 14:59:51 +0200 (CEST) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by dpdk.org (Postfix) with ESMTP id AD7F91D62F for ; Tue, 19 May 2020 14:59:50 +0200 (CEST) Received: by mail-wr1-f44.google.com with SMTP id k13so13718839wrx.3 for ; Tue, 19 May 2020 05:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jg9C2qjdDht6nhbmmF6PBoGeaex5trT3jbmBPHTLklE=; b=WSntmbsIiTKXfWsLN/t91Cumzfm00cApwywUKI4inWYqKRYXxcvA4/OAsTn4bmHjD3 aD7PapnFUzvDP6wUDcxlaR2HZceeDOokUNZtsVkxqQDDj5TZQJjJiokFQqS7WQ4iSQI8 GqrrnWzqQ3obaN/TIv5JcVM2Zh2HnqVHGBPUBiGkF0v0wSpHAXet0SqkTTE3AKKR9yFt +546BSwps1rt8NfaGNTWjeRPaYX9OLnhiDe5HiKK/XlzVH48/WF6GpH47/38dftt84Qf 9jsTCUQmi0TjvvAIKPWKSA2lGOXviGqvjme7wd1Hn8QC9RRowcM509AKBEzK5TcLPsJi 967Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jg9C2qjdDht6nhbmmF6PBoGeaex5trT3jbmBPHTLklE=; b=hwlHcTpLkTsGwr5byvNL+MghJejMcNx0t//Zf3GLFQH88Q2jzUG3aq/7mA5IIAlMMx HWSJ9nksxU70PdpDoaZT6ucQI7MZ4QRa89rHcm58PrDm1KPNgFwu1ZYVjHJ+YQFEn+XH /uZgAHjH6WVfaTuBFLKJLOmW9Qm2TBNgBhc/Slv77P+RCRB1o6yRi3t8uET+/ZZDDbbM u4MA+Vyx4eC1qbwu8oS2Kjja3QUUogfWjAyh2OfxFpbXn+x89ad/tA4Z9JQfpFoozsYS gaYb4Cu0XnVHzDz6bL3BVk224d3oLrT9bhmit4CU3vBTvaPZKbU0gIh+xwfW2jHKv2Rn vTLw== X-Gm-Message-State: AOAM532MX08lQ7zOn4dunadNIfrDydlaDXFgb4VUWcy5jqbl6Eqgv5J3 WgW7Ct7spfP5VvWA00TMikc= X-Google-Smtp-Source: ABdhPJwX3jyf6N03UfjRQ2ZX6eUxl1nEdGXMYCi54H8w304g0l+/bOrwoKoz1xYPFp6RJWuwjFxuOw== X-Received: by 2002:a5d:49ca:: with SMTP id t10mr24052021wrs.285.1589893190434; Tue, 19 May 2020 05:59:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h1sm4045405wme.42.2020.05.19.05.59.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Nithin Dabilpuram Cc: David Marchand , Neil Horman , Jerin Jacob , dpdk stable Date: Tue, 19 May 2020 13:53:59 +0100 Message-Id: <20200519125804.104349-49-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'devtools: fix symbol map change check' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From 7c8ab0ae700771d372625fcc5e9dbc01c797399c 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 c5434f3bb0..ed2178e36e 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -17,13 +17,11 @@ build_map_changes() # map files are altered, and all section/symbol names # 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 # with a { identifies a versioned section. The section name is -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:20.858343785 +0100 +++ 0049-devtools-fix-symbol-map-change-check.patch 2020-05-19 13:56:18.279502899 +0100 @@ -1,8 +1,10 @@ -From f08885494f241b115ad66763b585fbfb486d5160 Mon Sep 17 00:00:00 2001 +From 7c8ab0ae700771d372625fcc5e9dbc01c797399c 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/..." @@ -11,7 +13,6 @@ to '0' and we get check patch errors which are not true. Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") -Cc: stable@dpdk.org Signed-off-by: David Marchand Signed-off-by: Nithin Dabilpuram