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 5A627428F8 for ; Sun, 9 Apr 2023 17:46:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3E02427EE; Sun, 9 Apr 2023 17:46:01 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 2258240A80 for ; Sun, 9 Apr 2023 17:46:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fKbZynMrcvvlGPRocLT6n+D59KgJFFoIAmyBhUEexDTJNAlxYh0ey8N7douAyw2HUPR0fScseKTlxA4KHB/nGxw+438UAYx3oKYtDxzUIXtW2NoARcm4VfMg+EcaOnZyv5ufFUhVJwDrY2UnVLhpb48YCclL39UF6x9Duod0jQY8F0G3OSPtbV3JkFAY8G6B179gI73FT/Mj1yRRV33lYSptXKT7FYAsgew2pWQEe/bwEaenqDsvLAC+04upDheTamSnHuIfSgRegtCtH5QaX7OwArHCwNxbnoRmG79DTkzl7QbPPuSFlO2qp1Ah1qKp2mN+bGm0tirDy8U5exDuhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pyv/jXCcP57rZ5RpNBw1ORXlw/U7PCRCmpaJ8M2l66c=; b=YFaw/BIoOFkXHdnt2ookj4f6mcGbyCX5FwxSHcH2PfihsoObuUjwv8310UFGzWcr9++9ix48porRsevsmuzkJXAwwVsLUAfPFktISdU6R27bFi7ZB8Q34bGDhjljwlGYfSdDNLosm6SBw/yjDiaF17RQXESuA32OwWUb8q4DI76dP41hCUkv6v5t6ir7Y0G0GIGvvc0r6P/lHsl24UovZ7UHxwnn6aROlVWL0NkopY1oBqcRakGHojwUpQBuGvMyQ2bAZxFf5L7J2SW41TnD8bqGIbm8MI8s13UYX8FaTd57q3jM+0JKAR+buPvMxXK9V0UsJzA0eKpZ4zWMZX3iew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pyv/jXCcP57rZ5RpNBw1ORXlw/U7PCRCmpaJ8M2l66c=; b=mwyL55s1qBwz2RivJul3+mwc1IKOryXqnz5nsOSoURxNuIA+xRwHyWp2piOguOzia3s+oMhGc605zk7HNPNGIanIIZCF+v0VTprgs7wkG7/vd5FywvV2Ai+btpGvPhlTZCMNJf7VujGe0JTpE11H3uZi/SeQkQSbPMy0QliTXNlzZ3s12hsVpdcjYDQ7ryA0r6AMrbG88vigKro5d24PkrGFWM38tbpeZnnXXyPWgONsztcAejnbsVuFRIxnJWucqXU3SyD+flDbdm3YL/PCfFw5KG6vsvzNANdpteGlH/3WsxQulMtA/w2jvi3lrI0QFAyn44bt+cYo8tIZ5zV03Q== Received: from BN8PR12CA0010.namprd12.prod.outlook.com (2603:10b6:408:60::23) by CH0PR12MB5329.namprd12.prod.outlook.com (2603:10b6:610:d4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:45:56 +0000 Received: from BL02EPF000145B9.namprd05.prod.outlook.com (2603:10b6:408:60:cafe::24) by BN8PR12CA0010.outlook.office365.com (2603:10b6:408:60::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34 via Frontend Transport; Sun, 9 Apr 2023 15:45:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF000145B9.mail.protection.outlook.com (10.167.241.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:45:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:45:43 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:45:41 -0700 From: Xueming Li To: Thomas Monjalon CC: David Marchand , Ferruh Yigit , dpdk stable Subject: patch 'devtools: move mailmap check after patch applied' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:45:27 +0800 Message-ID: <20230409154530.7780-1-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227062349.13764-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF000145B9:EE_|CH0PR12MB5329:EE_ X-MS-Office365-Filtering-Correlation-Id: b7380c3f-17af-4e2c-6809-08db391181f5 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kPIh9LUUYrLPLjE2E0XVr3IqXoB+SpTT8z7HXY+ePzyhguwtcN0mgrK5jpBrNrozYQ9DyHxk/gCGFeeFmvA/gTsKsr64qkSWIdColwBMrxhayxSc6BluuVWVuBfXnwXpcn0bkrFKMAgi0Ur8/rWPFhIdMNH6797WKPUvMUgMVu9lxI4gJvpUymVH+ji5TTz3drYYiDTNHQbeCqyKZu2DldRTWzhgsKBlsO0joGkJ8p3QBPcRD6wCdGMeLXsemb9Ig77cN7Cag7SDbZ/JHChOm0Yp8D36lBD6vCp2vg3iv9U6VNYeW6yNEUIdhid8oghX78+mdnqXWBxIKj8nViixzbKap2V1fcTZvmS/IzVfALdALJU63x+PuXVv39SAz/VdIsoOWt1mXfznhPhinNenJQpcWL6sUelH3Oh723N6ODDbO5gfNjnV3ST4qYq0FLWUqeQqj8Gbi03AvLZ4hpOMIVjWKDUx/bmDlCnkrSprJquk2E3xmbfdhYHFjXeKqM4cIAzilpYG13l7y00iAGe7B7yfEUjZs0HSn8Ekl1A1CrYCrk3XOrgVFX1uciyvs96jLAqcunTPyvU4btW6BcONvhv9RwNVmDgbqhJ4dHaiwhl4pe/y5VgN9AHmIEbXhF2iZEiWs3kX7fZpgUKosNuUzkDq5j83nRMUob/VeWqy86ij6OmYEMSKRtNrmJQrr+ncyWor1cqj3ahRjuqFaZo1go3259yRaaMgv+mRr7WKJNPPk8CLdhPEfIhy2VcK2cMXs7CM2g5m8DKRB2/NFt9NnDMLfY4R2ci9pVFdnp/ABwBVgOmg10pEdDHaawri+xUg9C4TUWiV44ToJXOmAXMXiA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(376002)(39860400002)(396003)(451199021)(36840700001)(40470700004)(46966006)(86362001)(36756003)(316002)(41300700001)(70586007)(8676002)(6916009)(4326008)(966005)(7696005)(70206006)(54906003)(478600001)(55016003)(40480700001)(82310400005)(5660300002)(2906002)(8936002)(36860700001)(356005)(82740400003)(7636003)(186003)(16526019)(6286002)(6666004)(53546011)(1076003)(26005)(2616005)(426003)(336012)(83380400001)(47076005)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:45:55.8753 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7380c3f-17af-4e2c-6809-08db391181f5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF000145B9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5329 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 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/abf51507806a5f79b5ef091bcb8f91e565ea28a4 Thanks. Xueming Li --- >From abf51507806a5f79b5ef091bcb8f91e565ea28a4 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 27 Mar 2023 16:52:19 +0200 Subject: [PATCH] devtools: move mailmap check after patch applied Cc: Xueming Li [ upstream commit 83812de4f2f3f00081b8fee08be11678ed5c62e0 ] The names in a patch were possibly checked with checkpatches.sh before applying the patch, so before .mailmap file was updated. The check is moved and translated in check-git-log.sh, which is run only on a repository, not a detached patch file. Fixes: e83d41f0694d ("mailmap: add list of contributors") Signed-off-by: Thomas Monjalon Reviewed-by: David Marchand Tested-by: Ferruh Yigit --- devtools/check-git-log.sh | 15 +++++++++++++++ devtools/checkpatches.sh | 30 ------------------------------ 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh index e26205814b..af751e49ab 100755 --- a/devtools/check-git-log.sh +++ b/devtools/check-git-log.sh @@ -259,6 +259,21 @@ done) [ -z "$bad" ] || { printf "Missing 'Signed-off-by:' tag: \n$bad\n"\ && failure=true;} +# check names +names=$(git log --format='From: %an <%ae>%n%b' --reverse $range | + sed -rn 's,.*: (.*<.*@.*>),\1,p' | + sort -u) +bad=$(for contributor in $names ; do + ! grep -qE "^$contributor($| <)" $selfdir/../.mailmap || continue + if grep -q "^${contributor%% <*} <" .mailmap ; then + printf "\t$contributor is not the primary email address\n" + else + printf "\t$contributor is unknown in .mailmap\n" + fi +done) +[ -z "$bad" ] || { printf "Contributor name/email mismatch with .mailmap: \n$bad\n"\ + && failure=true;} + total=$(echo "$commits" | wc -l) if $failure ; then printf "\nInvalid patch(es) found - checked $total patch" diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index 1dee094c7a..a07bbc83cb 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -248,28 +248,6 @@ check_release_notes() { # grep -v $current_rel_notes } -check_names() { # - res=0 - - old_IFS=$IFS - IFS=' -' - for contributor in $(sed -rn '/^$/,/^--- / {s/.*: (.*<.*@.*>)/\1/p}' $1); do - ! grep -qE "^$contributor($| <)" .mailmap || continue - name=${contributor%% <*} - if grep -q "^$name <" .mailmap; then - reason="$name mail differs from primary mail" - else - reason="$contributor is unknown" - fi - echo "$reason, please fix the commit message or update .mailmap." - res=1 - done - IFS=$old_IFS - - return $res -} - number=0 range='origin/main..' quiet=false @@ -378,14 +356,6 @@ check () { # ret=1 fi - ! $verbose || printf '\nChecking names in commit log:\n' - report=$(check_names "$tmpinput") - if [ $? -ne 0 ] ; then - $headline_printed || print_headline "$subject" - printf '%s\n' "$report" - ret=1 - fi - if [ "$tmpinput" != "$1" ]; then rm -f "$tmpinput" trap - INT -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:42.302553800 +0800 +++ 0138-devtools-move-mailmap-check-after-patch-applied.patch 2023-04-09 21:45:38.819042200 +0800 @@ -1 +1 @@ -From 83812de4f2f3f00081b8fee08be11678ed5c62e0 Mon Sep 17 00:00:00 2001 +From abf51507806a5f79b5ef091bcb8f91e565ea28a4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 83812de4f2f3f00081b8fee08be11678ed5c62e0 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org