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 7E451A0032 for ; Fri, 18 Feb 2022 13:40:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7981440141; Fri, 18 Feb 2022 13:40:14 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id CA64E41140 for ; Fri, 18 Feb 2022 13:40:12 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id k127-20020a1ca185000000b0037bc4be8713so8535784wme.3 for ; Fri, 18 Feb 2022 04:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J7CJxFZZDD+Tv0+VzwLUzDngD6+c6g4VJcqXdY0Q8K8=; b=P7EAju271f8JIkNGE1laFbzndDYlrcCoTsPB072EykfgPTfzv/ZnSm1Bq68eo9xqIJ io40kAVHjdKnXYY9eDr4eEOFrAD1ozQF4BUBxS09krXyj6DrfQS4OlL9BBdrYFbKCM1Y A8zKgCZhEde5talpHzF/0lxXkalPIdzIjchw6RpPBzakzLb6SrzuXZGL4KKWNaCe426k M9y3AzIP0FfVdDt8pvwHu3FCCwWAaCHhdT5+Ra2DmIa5d4PZDFssVyNfbEit0Qk+prA+ YRPyLW7xY+LWy3LA8Hs8mkitiPHEo8fWRyCO9lf6RKoyOJPspSDxrLSUex6g+u42IAjR mfMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J7CJxFZZDD+Tv0+VzwLUzDngD6+c6g4VJcqXdY0Q8K8=; b=buxXKvgAysrYGXrjOaZ3pVMaLRzthnUbGWSl5GJkHHP67TNv8gMNpu5pivDW1tfkyb Ce0z0FYD+R4fXCrK+ff9dud4Z5AVqq/uJEFLocvRoXHAQ8nZE/Zr+D+SPYJtFflUcrFB /Sypp10yXjtUPE2bVZSb3h3BBgrAwKIjx4vPpeAFBxJ6hTqd++Yleu6vEKycR1ZUE3VC U+IkDdl6EDARj6AtsS9NVHcZXv34sNcsqHLDnYiiQABOBI3Ho5XgkrV/7jfwAm6oppTr D20JEOG1HPkQPDgxSeZjCavtxvgMBnkOvFLFkw+YBbhNAtt05T7bVzpsGIsRa/4NhVR4 FfLA== X-Gm-Message-State: AOAM5322LHIgGjFHonEd1Loxl6me2rmYxkgp7KzOj3lgYtedomjDIba1 AeCX7uN4pNPIBJTnTnxk17IHu4J3fYxlCw== X-Google-Smtp-Source: ABdhPJyU28M3B0axqlyYzAeqLUiK4jE0M4jAa916haIoX9t/v5OJR9u3pndhOP1awQlkigiND2YtfQ== X-Received: by 2002:a05:600c:1988:b0:37c:505:d45c with SMTP id t8-20020a05600c198800b0037c0505d45cmr6975283wmq.107.1645188012521; Fri, 18 Feb 2022 04:40:12 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id a9sm26190816wrg.53.2022.02.18.04.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:40:11 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Thomas Monjalon , dpdk stable Subject: patch 'devtools: fix comment detection in forbidden token check' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:37:41 +0000 Message-Id: <20220218123931.1749595-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4ee719c72ea69336a8d9b6688e8a5536b87bc3a9 Thanks. Luca Boccassi --- >From 4ee719c72ea69336a8d9b6688e8a5536b87bc3a9 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 @@ -20,6 +20,9 @@ BEGIN { # state machine assumes the comments structure is enforced by # checkpatches.pl (in_file) { + if ($0 ~ "^@@") { + in_comment = 0 + } # comment start if (index($0,comment_start) > 0) { in_comment = 1 -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:38.648154419 +0000 +++ 0012-devtools-fix-comment-detection-in-forbidden-token-ch.patch 2022-02-18 12:37:37.510787900 +0000 @@ -1 +1 @@ -From fdcc8970bce23d476e7fabd18a82fb298725c511 Mon Sep 17 00:00:00 2001 +From 4ee719c72ea69336a8d9b6688e8a5536b87bc3a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fdcc8970bce23d476e7fabd18a82fb298725c511 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org