From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) by dpdk.org (Postfix) with ESMTP id 542191B525 for ; Sat, 1 Dec 2018 20:14:24 +0100 (CET) Received: from cpe-2606-a000-111b-453b-215-ff-fecc-4872.dyn6.twc.com ([2606:a000:111b:453b:215:ff:fecc:4872] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1gSupO-0006OR-0Y; Fri, 30 Nov 2018 21:16:31 -0500 Date: Sat, 1 Dec 2018 14:13:35 -0500 From: Neil Horman To: Kevin Traynor Cc: Cody Doucette , dpdk stable Message-ID: <20181201191335.GA27100@neilslaptop.think-freely.org> References: <20181129132128.7609-1-ktraynor@redhat.com> <20181129132128.7609-62-ktraynor@redhat.com> <20181130135500.GD24285@hmswarspite.think-freely.org> <28a0e560-5272-8a7c-fe38-7074657660ce@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <28a0e560-5272-8a7c-fe38-7074657660ce@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: 0.3 (/) X-Spam-Status: No Subject: Re: [dpdk-stable] patch 'devtools: fix regex in symbol addition check' has been queued to stable release 18.08.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: Sat, 01 Dec 2018 19:14:24 -0000 On Fri, Nov 30, 2018 at 08:36:25PM +0000, Kevin Traynor wrote: > On 11/30/2018 01:55 PM, Neil Horman wrote: > > On Thu, Nov 29, 2018 at 01:21:02PM +0000, Kevin Traynor wrote: > >> Hi, > >> > >> FYI, your patch has been queued to stable release 18.08.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/08/18. So please > >> shout if anyone has objections. > >> > > Sounds good, thanks > > > >> Also note that after the patch there's a diff of the upstream commit vs the patch applied > >> to the branch. If the code is different (ie: not only metadata diffs), due for example to > >> a change in context or macro names, please double check it. > >> > > I'm not sure what you mean by this. Why are you not just cherry picking commit > > 5a5f4676eb93fa410b56df060a6d0c7603469f81 from the unstable tree? > > > > Hi Neil, it's just a way of flagging to authors for cases where the > patch did not apply on stable and had to be modified. In that case, it > is requesting the author to check that the changes are correct. In this > and most cases, it can backport to stable with no modifications. > > Kevin. > > > Neil > > > >> Thanks. > >> > >> Kevin Traynor > >> > >> --- > >> From 947cfe55d758c6012761bc5c06a44dc6e531540d Mon Sep 17 00:00:00 2001 > >> From: Neil Horman > >> Date: Thu, 1 Nov 2018 09:54:10 -0400 > >> Subject: [PATCH] devtools: fix regex in symbol addition check > >> > >> [ upstream commit 5a5f4676eb93fa410b56df060a6d0c7603469f81 ] > >> > >> The regex to determine the end of the map file chunk in a patch seems to > >> be wrong, It was using perl regex syntax, which awk doesn't appear to > >> support (I'm still not sure how it was working previously). Regardless, > >> it wasn't triggering and as a result symbols were getting added to the > >> mapdb that shouldn't be there. > >> > >> Fix it by converting the regex to use traditional posix syntax, matching > >> only on the negation of the character class [^map] > >> > >> Tested and shown to be working on the ip_frag patch set provided by > >> doucette@bu.edu > >> > >> Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") > >> > >> Reported-by: Cody Doucette > >> Signed-off-by: Neil Horman > >> --- > >> devtools/check-symbol-change.sh | 3 +-- > >> 1 file changed, 1 insertion(+), 2 deletions(-) > >> > >> diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh > >> index cf9cfc745..9fb214dc0 100755 > >> --- a/devtools/check-symbol-change.sh > >> +++ b/devtools/check-symbol-change.sh > >> @@ -24,5 +24,5 @@ build_map_changes() > >> # When we hit this, turn off the in_map variable, which > >> # supresses the subordonate rules below > >> - /[-+] a\/.*\.^(map)/ {in_map=0} > >> + /[-+] a\/.*\.[^map]/ {in_map=0} > >> > >> # Triggering this rule, which starts a line and ends it > >> @@ -154,5 +154,4 @@ build_map_changes "$patch" "$mapfile" > >> check_for_rule_violations "$mapfile" > >> exit_code=$? > >> - > >> rm -f "$mapfile" > >> > >> -- > >> 2.19.0 > >> > >> --- > >> Diff of the applied patch vs upstream commit (please double-check if non-empty: > >> --- > >> --- - 2018-11-29 13:11:36.603235041 +0000 > >> +++ 0061-devtools-fix-regex-in-symbol-addition-check.patch 2018-11-29 13:11:34.000000000 +0000 > >> @@ -1,8 +1,10 @@ > >> -From 5a5f4676eb93fa410b56df060a6d0c7603469f81 Mon Sep 17 00:00:00 2001 > >> +From 947cfe55d758c6012761bc5c06a44dc6e531540d Mon Sep 17 00:00:00 2001 > >> From: Neil Horman > >> Date: Thu, 1 Nov 2018 09:54:10 -0400 > >> Subject: [PATCH] devtools: fix regex in symbol addition check > >> > >> +[ upstream commit 5a5f4676eb93fa410b56df060a6d0c7603469f81 ] > >> + > >> The regex to determine the end of the map file chunk in a patch seems to > >> be wrong, It was using perl regex syntax, which awk doesn't appear to > >> support (I'm still not sure how it was working previously). Regardless, > >> @@ -16,7 +18,6 @@ > >> doucette@bu.edu > >> > >> Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") > >> -Cc: stable@dpdk.org > >> > >> Reported-by: Cody Doucette > >> Signed-off-by: Neil Horman > >> @@ -25,7 +26,7 @@ > >> 1 file changed, 1 insertion(+), 2 deletions(-) > >> > >> diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh > >> -index c0d2a6da1..1d21e9165 100755 > >> +index cf9cfc745..9fb214dc0 100755 > >> --- a/devtools/check-symbol-change.sh > >> +++ b/devtools/check-symbol-change.sh > >> @@ -24,5 +24,5 @@ build_map_changes() > >> > > Ah, apologies. Yes, your adaptations are good to go, thanks! Neil