From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 35537A034E for ; Mon, 21 Feb 2022 16:37:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F3E5410F3; Mon, 21 Feb 2022 16:37:54 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2CAFA41143 for ; Mon, 21 Feb 2022 16:37:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457870; 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=sy5m053Fqfik62jvXky6xIVD1lguLqdo62jLtBc1MVg=; b=OEhDmpVbg3SLoGeOs8mCXeh2RdlRQFGHQpOTOOwU6h36SAmDpW9H/ChBzmOBEX4qU1S65j /TdTgGtlYXt8KY3U+bLbJHj35FnwmNdXshoIE7HSiJo5izE1Eph0FIVgaCpL6L0zqQ4MHX rcij4aexRoox8ZOUR+NR6ouaJMaWLwQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-458-E5m7CXIzO_G2yJ0vhx6vGQ-1; Mon, 21 Feb 2022 10:37:44 -0500 X-MC-Unique: E5m7CXIzO_G2yJ0vhx6vGQ-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 973F02F45; Mon, 21 Feb 2022 15:37:43 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D3FA7E131; Mon, 21 Feb 2022 15:37:42 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Thomas Monjalon , dpdk stable Subject: patch 'devtools: fix comment detection in forbidden token check' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:36 +0000 Message-Id: <20220221153625.152324-27-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.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 02/26/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/bb6b3ec4e91a6a9472e9fb8fb8e2ed7d7c86f32e Thanks. Kevin --- >From bb6b3ec4e91a6a9472e9fb8fb8e2ed7d7c86f32e Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 27 Jan 2022 11:55:11 +0100 Subject: [PATCH] devtools: fix comment detection in forbidden token check [ upstream commit fdcc8970bce23d476e7fabd18a82fb298725c511 ] After a comment section was detected, passing to a new hunk was not seen as ending the section and all subsequent hunks were ignored. Fixes: 7413e7f2aeb3 ("devtools: alert on new calls to exit from libs") Reported-by: Thomas Monjalon Signed-off-by: David Marchand --- devtools/check-forbidden-tokens.awk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/devtools/check-forbidden-tokens.awk b/devtools/check-forbidden-tokens.awk index 61ba707c9b..026844141c 100755 --- a/devtools/check-forbidden-tokens.awk +++ b/devtools/check-forbidden-tokens.awk @@ -21,4 +21,7 @@ BEGIN { # checkpatches.pl (in_file) { + if ($0 ~ "^@@") { + in_comment = 0 + } # comment start if (index($0,comment_start) > 0) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.234751198 +0000 +++ 0027-devtools-fix-comment-detection-in-forbidden-token-ch.patch 2022-02-21 15:22:44.048704028 +0000 @@ -1 +1 @@ -From fdcc8970bce23d476e7fabd18a82fb298725c511 Mon Sep 17 00:00:00 2001 +From bb6b3ec4e91a6a9472e9fb8fb8e2ed7d7c86f32e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fdcc8970bce23d476e7fabd18a82fb298725c511 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org