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 3D985A055A for ; Thu, 27 Feb 2020 10:35:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 35F8B1C01; Thu, 27 Feb 2020 10:35:53 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 7588B1C01 for ; Thu, 27 Feb 2020 10:35:52 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id p18so2394704wre.9 for ; Thu, 27 Feb 2020 01:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kDPqbJlb9qs4saAP4kucfklQx+t95UVMDHNSoBxa4sM=; b=M3MtQMhQcQ7KkgprZ6+S9/KeC4g0P7OMqwPk6fbTGQU+XBaKVlEiqubnwft3cxJleV +xZ8SDlCmdV5/W70iDrs7AFna6hJXvwBfD04NK+VSxiv+lZyRaqZNOvIeufHorrYhpdx Vxf0fYQ83bSGjaNfDKoWST1mTgddZyKXFGStMYgUDmIlNfgED9apgVkTvAgTgbiyjSeW L5CPTQfgojJKduPv8Ms+gjhmTte20fv8QlBqMOWnISq2ckmDKRYBsKHiu0pLj4yIrUmU j77fwd+xVIOYlhRH09lISaVP1ZCESy90VtmK+pNBOqb6PrZ1GLK5JK1srfcd1HbmJitn digA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kDPqbJlb9qs4saAP4kucfklQx+t95UVMDHNSoBxa4sM=; b=NZbe8n4Nao9M5Mx8l8SK1Ka9/l8hOyWppFoxwJ7zqYwOtvZgov59Z1yohGgtaB2WUA AiD81MrAL5c6jDXeIhDmPr+Gylrnl/wM0ArGUlKxFI3zFz7dEsLmqaJJ2qY5vLFBn/zp r4vAqjY6Y5b3Ql4U+foX85sINTuX00uENJzO4I+h5MEBdkfh5T/SPVVNGxe3bQ7ppleS 6NtH8nbDOExQjGEeBEstoC5HNIrAiJsreFIIiAz+fOJifVUURQGywhu8+B0XL6sYiQUE c5Clm4SWewFbce5pt+Lq6qWwKMWUEUhTsy5TtWhd9yLJy6LsiqZp/JkRdE/cZyUkgntH H4NQ== X-Gm-Message-State: APjAAAVOgTZaXI2Y0qU/KqPXbEYq3J6JXQr8pJkQjLN4wPwgBS15660x ugbuUxOH31kbyN4a09LnI8E= X-Google-Smtp-Source: APXvYqzZQ2c4GiqHGfeZkRfs7nu4BxwzWoLGvqna8NY50/fUyO++rn4zWnnNa60mG82V5ac2pnxIAA== X-Received: by 2002:adf:f751:: with SMTP id z17mr3960624wrp.207.1582796152214; Thu, 27 Feb 2020 01:35:52 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a22sm6925025wmd.20.2020.02.27.01.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:35:51 -0800 (PST) From: luca.boccassi@gmail.com To: Kevin Traynor Cc: dpdk stable Date: Thu, 27 Feb 2020 09:34:02 +0000 Message-Id: <20200227093402.17690-42-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com> References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'devtools: add fixes flag to commit listing' has been queued to stable release 19.11.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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/29/20. 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. Thanks. Luca Boccassi --- >From 13c926a42ad9634ac46aa7b6eec1d5bd7c72e71b Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Mon, 3 Feb 2020 15:59:55 +0000 Subject: [PATCH] devtools: add fixes flag to commit listing [ upstream commit 8070d8fecb4ec263ce875d34e8093b973f250170 ] During backporting, if the fixes or stable tag are missing, it usually requires some investigation by stable maintainer as to why. The presence of a fixes tag may be known from whether the originating release of the issue is printed at the end of the line but with variable line lengths and nested partial fixes it doesn't catch the eye. When there are a large amount of commits, adding an aligned column indicating the presence of a fixes tag beside the stable one makes it easier to quickly see the patches requiring further investigation. e.g. 20.02 8f33cbcfa S F net/i40e/base: fix buffer address (16.04) 20.02 4b3da9415 S F net/i40e/base: fix error message (1.7.0) 20.02 1da546c39 - F net/i40e/base: fix missing link modes (17.08) 20.02 79bfe7808 S F net/i40e/base: fix Tx descriptors number (1.7.0) 20.02 50126939c - F net/i40e/base: fix retrying logic (18.02) 20.02 dcd05da0a S F app/testpmd: fix GENEVE flow item (18.02) 20.02 b0b9fdad2 S - net/bnx2x: support secondary process (N/A) 20.02 f8279f47d S F net/netvsc: fix crash in secondary process (18.08) Signed-off-by: Kevin Traynor --- devtools/git-log-fixes.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index e37ee22600..6d468d6731 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -94,11 +94,23 @@ stable_tag () # fi } +# print a marker for fixes tag presence +fixes_tag () # +{ + if git log --format='%b' -1 $1 | grep -qi '^Fixes: *' ; then + echo 'F' + else + echo '-' + fi +} + git log --oneline --reverse $range | while read id headline ; do origins=$(origin_filter $id) stable=$(stable_tag $id) - [ "$stable" = "S" ] || [ -n "$origins" ] || echo "$headline" | grep -q fix || continue + fixes=$(fixes_tag $id) + [ "$stable" = "S" ] || [ "$fixes" = "F" ] || [ -n "$origins" ] || \ + echo "$headline" | grep -q fix || continue version=$(commit_version $id) if [ -n "$origins" ] ; then origver="$(origin_version $origins)" @@ -108,5 +120,5 @@ while read id headline ; do else origver='N/A' fi - printf '%s %7s %s %s (%s)\n' $version $id $stable "$headline" "$origver" + printf '%s %7s %s %s %s (%s)\n' $version $id $stable $fixes "$headline" "$origver" done -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:57.147862593 +0000 +++ 0042-devtools-add-fixes-flag-to-commit-listing.patch 2020-02-27 09:31:55.855946752 +0000 @@ -1,8 +1,10 @@ -From 8070d8fecb4ec263ce875d34e8093b973f250170 Mon Sep 17 00:00:00 2001 +From 13c926a42ad9634ac46aa7b6eec1d5bd7c72e71b Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Mon, 3 Feb 2020 15:59:55 +0000 Subject: [PATCH] devtools: add fixes flag to commit listing +[ upstream commit 8070d8fecb4ec263ce875d34e8093b973f250170 ] + During backporting, if the fixes or stable tag are missing, it usually requires some investigation by stable maintainer as to why.