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 3B22EA04B5 for ; Tue, 3 Dec 2019 19:28:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 32DAD1BF94; Tue, 3 Dec 2019 19:28:53 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 7F7D0235 for ; Tue, 3 Dec 2019 19:28:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397731; 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=InZsW/r34k3zDBam9vv/msv9vXv4vskavsToQUvua7Q=; b=Sm9yColn8zeYbHPySwT0/r0nzrsIT/PtmiaDAIDmVaoV83hioY5lCQBbAUNzlZN8tYmGZJ ELJCBqSG1TZfOEv6Wj+KFwzzNMjaZh3gnGT0QwIxfvuZh+31jarxd2FiQt8OL25H/OERr2 6ISxwlZZqkkicijs8E3IwSz0VPR64gI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-295-FLnpPLLnOCyBtxRVo1RYeQ-1; Tue, 03 Dec 2019 13:28:47 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4AC588017CC for ; Tue, 3 Dec 2019 18:28:46 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85DDA5C3FA; Tue, 3 Dec 2019 18:28:45 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: dpdk stable Date: Tue, 3 Dec 2019 18:26:51 +0000 Message-Id: <20191203182714.17297-42-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: FLnpPLLnOCyBtxRVo1RYeQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'devtools: fix cleanup of checkpatch temporary file' has been queued to LTS release 18.11.6 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 LTS release 18.11.6 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/10/19. 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 rebasi= ng (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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4b01f16ae0c477d647= edb180b3aadc79a08a6a57 Thanks. Kevin. --- >From 4b01f16ae0c477d647edb180b3aadc79a08a6a57 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 13 Aug 2019 08:38:22 +0200 Subject: [PATCH] devtools: fix cleanup of checkpatch temporary file [ upstream commit 2c7845a70e708039c3f129de86ffcf1fccfa76d9 ] The regexp part of the cleanup routine was not updated accordingly when a common prefix for temp files was introduced. Set the trap handler only when required. Fixes: ff37ca5d3773 ("devtools: use a common prefix for temporary files") Signed-off-by: David Marchand --- devtools/checkpatches.sh | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index 02d1c303e..c471731d4 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -24,12 +24,4 @@ LINE_SPACING,PARENTHESIS_ALIGNMENT,NETWORKING_BLOCK_COMM= ENT_STYLE,\ NEW_TYPEDEFS,COMPARISON_TO_NULL" =20 -clean_tmp_files() { -=09if echo $tmpinput | grep -q '^checkpatches\.' ; then -=09=09rm -f "$tmpinput" -=09fi -} - -trap "clean_tmp_files" INT - print_usage () { =09cat <<- END_OF_HELP @@ -105,11 +97,14 @@ check () { # =09if [ -n "$1" ] ; then =09=09tmpinput=3D$1 -=09elif [ -n "$2" ] ; then -=09=09tmpinput=3D$(mktemp -t dpdk.checkpatches.XXXXXX) -=09=09git format-patch --find-renames \ -=09=09--no-stat --stdout -1 $commit > "$tmpinput" =09else =09=09tmpinput=3D$(mktemp -t dpdk.checkpatches.XXXXXX) -=09=09cat > "$tmpinput" +=09=09trap "rm -f '$tmpinput'" INT + +=09=09if [ -n "$2" ] ; then +=09=09=09git format-patch --find-renames \ +=09=09=09--no-stat --stdout -1 $commit > "$tmpinput" +=09=09else +=09=09=09cat > "$tmpinput" +=09=09fi =09fi =20 @@ -138,5 +133,8 @@ check () { # <patch> <commit> <title> =09fi =20 -=09clean_tmp_files +=09if [ "$tmpinput" !=3D "$1" ]; then +=09=09rm -f "$tmpinput" +=09=09trap - INT +=09fi =09[ $ret -eq 0 ] && return 0 =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:54.230534165 +0000 +++ 0042-devtools-fix-cleanup-of-checkpatch-temporary-file.patch=092019-12-= 03 17:29:51.766749620 +0000 @@ -1 +1 @@ -From 2c7845a70e708039c3f129de86ffcf1fccfa76d9 Mon Sep 17 00:00:00 2001 +From 4b01f16ae0c477d647edb180b3aadc79a08a6a57 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2c7845a70e708039c3f129de86ffcf1fccfa76d9 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 8e2beee16..b16bace92 100755 +index 02d1c303e..c471731d4 100755 @@ -22,2 +23,2 @@ -@@ -37,12 +37,4 @@ NEW_TYPEDEFS,COMPARISON_TO_NULL" - options=3D"$options $DPDK_CHECKPATCH_OPTIONS" +@@ -24,12 +24,4 @@ LINE_SPACING,PARENTHESIS_ALIGNMENT,NETWORKING_BLOCK_COM= MENT_STYLE,\ + NEW_TYPEDEFS,COMPARISON_TO_NULL" @@ -35 +36 @@ -@@ -151,11 +143,14 @@ check () { # <patch> <commit> <title> +@@ -105,11 +97,14 @@ check () { # <patch> <commit> <title> @@ -55 +56 @@ -@@ -192,5 +187,8 @@ check () { # <patch> <commit> <title> +@@ -138,5 +133,8 @@ check () { # <patch> <commit> <title>