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 BF21E45E41 for ; Sat, 7 Dec 2024 09:10:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B512F40281; Sat, 7 Dec 2024 09:10:38 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2058.outbound.protection.outlook.com [40.107.243.58]) by mails.dpdk.org (Postfix) with ESMTP id 3BE4D40ED0 for ; Sat, 7 Dec 2024 09:10:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rzzw47Dwb9jedH3OrlyxE6o9y0rp8U2HSX6zPFPCQkxovz9a/jXCyuvML+CQakvTSJVV5PSETb7IObo3Y2kbqN9iAKeEnud1fXlZxqjzZzq9ixa+z4OJFbpFiJLZdJp813whhR/3HB042T31c3uC3xRaEVf+81i+8WsvadD03QGqJZb7qj4TO0QNoUgd1l2zQ/1zKqQqvry4FSn4QX+weaWzZc0ba/MLbElAKZs9EwvPKEYDfm6BOJO0IVpyMrNnWjREmqfKH144+dyxPa+njb1YonyF1JbJsrBflZh2D3QdZeWnZgV7Oh9uFegcPIDPWCeHRL+r9qQ4ayOOzPGJ3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=+pnF/+FdQp+HwQwAhulBSpWPnC04Q8I5hKpGkwO2usE=; b=tXsEBq2AlymQzIBgKaHkWu5szl3/JNkNtH7sbPldW2aj18+R5QPxYo6NvfVH+a2zSfgMNoVAZ51RD499cYDz2YtY/KEF5FK/vr/WYF8siFZ/+A8HJrYNIHRQMhpW3RXnDf8GFTVeZVFpOvnNWtEF/+8o9N8qWlF1FD9YSH/8qMSW3UeZ6tTTFonfzdKWJGz4TaYsmCoCiKJb5m5UTiozCj6GHMcj1mFl4uJunk58QRAqDSH7sJxO275VA/IX8YqyYwva/uf9gy8SzuSqlY8dFqDq+QGqvZpwLQ6XZGNa1VhT+8n/E1zunskMWxOatYEDqhIhU7GNKFE5/0HAmF+78Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 (0) 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=+pnF/+FdQp+HwQwAhulBSpWPnC04Q8I5hKpGkwO2usE=; b=ddnw3G9N75xqy84rv6so1SW6XLMZNm9T+z6swJmEjn5VJs/LPKcdsHX8nuC/SOaci3UJDK771pj3CQuJg08EMKEQ+VIKdNyp2SgtUj/IQXLFaSMmk/Dr5c1WKq89s3ZI+kbgYmvpwtXQmqIn42rcOFfhC2KneKDgQZVOKSK3UuymE2XBlGBZ437y3NmhAsDATe71V8ccLQOYPDWnslp3Ab5YNfM4p9y5JWwAjO0nA5k8V+fOTWH25E/QFfGqBNM1hEr5PaC0r/a63i5/yR4OozE1LHKzmLOQuPYWllV9jSfa/1l5xgF/jE23oM5Xx4AbKbNwTAr4H0+iBoOq1j869A== Received: from BLAPR03CA0001.namprd03.prod.outlook.com (2603:10b6:208:32b::6) by MW4PR12MB7144.namprd12.prod.outlook.com (2603:10b6:303:21b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.17; Sat, 7 Dec 2024 08:10:33 +0000 Received: from BL02EPF00021F68.namprd02.prod.outlook.com (2603:10b6:208:32b:cafe::3a) by BLAPR03CA0001.outlook.office365.com (2603:10b6:208:32b::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.10 via Frontend Transport; Sat, 7 Dec 2024 08:10:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL02EPF00021F68.mail.protection.outlook.com (10.167.249.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:10:32 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:10:16 -0800 Received: from nvidia.com (10.126.231.35) 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.1544.4; Sat, 7 Dec 2024 00:10:14 -0800 From: Xueming Li To: Thomas Monjalon CC: Xueming Li , Luca Boccassi , "Kevin Traynor" , dpdk stable Subject: patch 'devtools: fix check of multiple commits fixed at once' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:55 +0800 Message-ID: <20241207080055.488538-98-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00021F68:EE_|MW4PR12MB7144:EE_ X-MS-Office365-Filtering-Correlation-Id: d85acdab-a98e-4fc0-6dc7-08dd16969f42 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; ARA:13230040|1800799024|36860700013|376014|30052699003|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mF7nY0XR5jSSuRF6JCrDd/thyd/TvDbIXXSRB1AwsgW5JZGbU2MCuvIA/68b?= =?us-ascii?Q?pAlzMNsBZhHwvvLmO/FysOpXIVuhJ+hPg8ZAB5qtNLSk1Dog0A+LAhfB6CeB?= =?us-ascii?Q?MlY21TU6MOvkTNAhwhxoiwvnyYPFtmuY1wo5rbdtjm80OS9kmz5odH2HSjuQ?= =?us-ascii?Q?TurpQVyE+oN0uNLWrF8q31M2XVw3U2F5ggmq7LEs4sm41I7ZDlQryfHFcFK2?= =?us-ascii?Q?TpStzkwRJlztV6dNOVYsn5B1csOq8t7+M0s4HrtPxygCNxDLhgc/FsRdmeKx?= =?us-ascii?Q?OZnFWdYPpWBnYva9dCy0P2ckerNNkYke6HWApsY/WO059Sd0PBxEGjr90uQz?= =?us-ascii?Q?thhVwBVRl7COUK2KksdcoJQzoGj0c/zx/AFBERMO9q5kwoJSRiaqWbmvSBqS?= =?us-ascii?Q?KbiTY75ZvXbJLm0CRceXYfe56Mms7apZZSHOWg4O3NysIq1BQma8mJwqIK2a?= =?us-ascii?Q?59zCK0kfqvgkWiDqX5zTYxEJ5G0K1oDS4yGDbm1/oj7at7ly+MvgJ9Ew98CQ?= =?us-ascii?Q?+ETzgKvrj/DyJumueFt2anzGgceq3tAh2E6pVU/FGliWvaKDfRtwsmkiw5Vc?= =?us-ascii?Q?RZ/HdvKdLpdEUXagSUpugmAMzOmGwlYgi5PYFvpcE87Hh/YERud+G0nnYKPd?= =?us-ascii?Q?41xg8TwF3uMA81x+VmtKZDS0VyOiOPNjpEFSIbg48cnw1c8J1K7QYgSl8sr3?= =?us-ascii?Q?aXDMPDTlLjuGGzt1HxyeWF+b9Z5nGfkq6LjwEsHjOwDrZw2Nq0+qHualJQr9?= =?us-ascii?Q?txyr/2esGmQT1oMGfXqDyOu/Xh0swq7ik/m3tZafyRWXHOsbKdj1Hzb7GMN6?= =?us-ascii?Q?w9oNsAP+vru/HnAir0Y7feTxU0rcgUXabvesCUX2Le1NU/qxpfXCdUwf7qIk?= =?us-ascii?Q?l5+Br47SQFV/WfZKFbTcqhRWSUy0Aj5JuJVXA2ZkhtbcS62cT/F/TwurdadI?= =?us-ascii?Q?bdnnleOqlZY62+fp4/17sMCnuEsGdeeej/1RBTPrhAIoaoYXNjkUkZBd6bsT?= =?us-ascii?Q?Q1x7pYvAtcnAH7LQNuo/akShQoWfNrfAa/eKUHl6P7aVMqe1eEQn/nbtKMHy?= =?us-ascii?Q?pO31rml0xWUq+ZyBTzW67Ywxd6COq/wwUdHE7UiaKeEs/7VTyebAr5Z079U0?= =?us-ascii?Q?gfE6f0pFjXx9bw8AWGfDTy7Ayu/t10hPlyCcL5bRX7sFe8IAiTOMVG/hZCit?= =?us-ascii?Q?JMjxIv9ie2/4P+cV2lEdc23O25DUIa1wPhR9wTivQEPrfEkhJK3H/vIGvlvk?= =?us-ascii?Q?DjwidFIuuu26IsBn0CX7DJgq3xpQCc+St71pg/Or3FmHfxeSEDohm8BBXSlg?= =?us-ascii?Q?PJOwgiE8oHAutAsCt60v2HlN4iF3vjDs4J7E3rcCvCHaFKImuq8pKo7io1HK?= =?us-ascii?Q?U0LxieCu3xRokix0GLGmFb3eSdHe717tlDqtBPGR/RiCqRizrR/hbqYMAk1C?= =?us-ascii?Q?P/4/uf4p+1+GljiU3SFHB66zBpz+pHQZ?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(376014)(30052699003)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:10:32.7283 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d85acdab-a98e-4fc0-6dc7-08dd16969f42 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00021F68.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7144 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 23.11.3 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/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=87f65fa28ad09345f55e58e35e2c856ff4fc8bc2 Thanks. Xueming Li --- >From 87f65fa28ad09345f55e58e35e2c856ff4fc8bc2 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 18 Apr 2023 16:07:25 +0200 Subject: [PATCH] devtools: fix check of multiple commits fixed at once Cc: Xueming Li [ upstream commit dbee69686b63fab960a98295a7de542d45de9b6d ] When looking for fixes to backport, only the first origin commit hash (from "Fixes:") was checked. There is very little chance that the next commits being fixed have a wrong hash in the commit log of the fix, but it is fixed by checking them all before proceeding further. Fixes: 752d8e097ec1 ("scripts: show fixes with release version of bug") Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi Acked-by: Kevin Traynor --- devtools/git-log-fixes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 8a4a8470c2..4690dd4545 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -68,7 +68,7 @@ origin_version () # ... { for origin in $* ; do # check hash is valid - git rev-parse -q --verify $1 >&- || continue + git rev-parse -q --verify $origin >&- || continue # get version of this bug origin local origver=$(commit_version $origin) local roothashes="$(origin_filter $origin)" -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:47.280094210 +0800 +++ 0097-devtools-fix-check-of-multiple-commits-fixed-at-once.patch 2024-12-06 23:26:44.123044826 +0800 @@ -1 +1 @@ -From dbee69686b63fab960a98295a7de542d45de9b6d Mon Sep 17 00:00:00 2001 +From 87f65fa28ad09345f55e58e35e2c856ff4fc8bc2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dbee69686b63fab960a98295a7de542d45de9b6d ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org