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 5E2D9A034C for ; Fri, 25 Feb 2022 18:16:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 58AB3410FD; Fri, 25 Feb 2022 18:16:18 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 1912441152 for ; Fri, 25 Feb 2022 18:16:17 +0100 (CET) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id F04373F1BC for ; Fri, 25 Feb 2022 17:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809376; bh=HbQ4eTvdnoP2JFge0v8rHU+tXjRbXsbV34YAUnwaiCQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iJpV5YjJ5zbi8bn8EVB96JGzpTVObv8Ej+TgvTka5jfO+NvOzuLpZvnSx6wrxdbxQ 6kg3I5TyY69sHyfKa8CBS5QpNsmX4EQYXFis53UGibKzXF1E5PV0M15zFwhdKtwXdF Jc2KUt5JZaDX+EkS+HfUZoNZHs4tRUvB3wIEMO5ybM1ji8vdKcrR3Ko8Hs3PYF1D32 uRAOAJHKaI0IlJUPJODa7HFByCAFY+gSw4pp0V1lIUHSeDqD/y2htQF6nASRy2q7Hc t0LsRATbB98+7FDBHWjkvY+McvdqI1okLIEywWC3TVjSofLzZGBGLgK9xPRpDeJzLb MnhXkJj74uxbg== Received: by mail-wr1-f69.google.com with SMTP id w8-20020a5d4b48000000b001ef708e7f71so604957wrs.7 for ; Fri, 25 Feb 2022 09:16:16 -0800 (PST) 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=HbQ4eTvdnoP2JFge0v8rHU+tXjRbXsbV34YAUnwaiCQ=; b=1xKqQ76Aj//n+vBLz8qWQG5GALFCy0X3YPVF9PXEoRS1DHAk6iWoKIXmzi4wrC+UCW CwGOeb/3hd7FEm6LTq11nSrsYUKM9jZ5vnrz5bcT2BgeJT7sPL1jPPl65KaGe2jP5cbu qiKGVGg+ldoiRTM6kxgNsaoa6y0LElhHG8o5EZxQWUqmrzYZhShD838tprg9ycgXnZfL tMpsppD2gw5XqRM7hHFC30tz7q5B8NCQZKiDnwAtwukMVsnyE4/te1+J4Q2j2FyVXAr5 c0LvCa5UBU8hKh/plcKtmsLGhasZuDNbY/ZBOWmSuaT7ixdwGBeXHPGQnYodEvIbVWaF wsLg== X-Gm-Message-State: AOAM5307GBrcUPx42m96VhBVxvDACH1GOs6TtadvrdoCjmWequ+mGp8E uWKgOYrionhuAwFXApcAchqLb8ExqkS0gRBnyD2jZ+l+D8O1dSs5l+oXLNDbdaKLhvc/X/q1OJi JhLGzs2SyrCzQcAHJKROHPIga X-Received: by 2002:a5d:50c2:0:b0:1ef:7dc8:dc2f with SMTP id f2-20020a5d50c2000000b001ef7dc8dc2fmr568405wrt.656.1645809376670; Fri, 25 Feb 2022 09:16:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+4xZgj6zp2Tviv1HFRHzgqpZpV8QHQtTGZNO0Pj+iS1l1lJVHQDI7+qSq/WqltNsAaErUSA== X-Received: by 2002:a5d:50c2:0:b0:1ef:7dc8:dc2f with SMTP id f2-20020a5d50c2000000b001ef7dc8dc2fmr568395wrt.656.1645809376477; Fri, 25 Feb 2022 09:16:16 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id s3-20020a5d4ec3000000b001ea95eba44dsm2625340wrv.109.2022.02.25.09.16.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:16:15 -0800 (PST) From: christian.ehrhardt@canonical.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 19.11.12 Date: Fri, 25 Feb 2022 18:15:03 +0100 Message-Id: <20220225171550.3499040-10-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/692ac5fb54947906ab4380c5e462e9552e8e1b14 Thanks. Christian Ehrhardt --- >From 692ac5fb54947906ab4380c5e462e9552e8e1b14 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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:44.681028708 +0100 +++ 0010-devtools-fix-comment-detection-in-forbidden-token-ch.patch 2022-02-25 16:58:44.196990375 +0100 @@ -1 +1 @@ -From fdcc8970bce23d476e7fabd18a82fb298725c511 Mon Sep 17 00:00:00 2001 +From 692ac5fb54947906ab4380c5e462e9552e8e1b14 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fdcc8970bce23d476e7fabd18a82fb298725c511 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org