patch 'devtools: fix check of multiple commits fixed at once' has been queued to stable release 23.11.3
Xueming Li
xuemingl at nvidia.com
Sat Dec 7 09:00:55 CET 2024
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 <xuemingl at nvidia.com>
---
>From 87f65fa28ad09345f55e58e35e2c856ff4fc8bc2 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 18 Apr 2023 16:07:25 +0200
Subject: [PATCH] devtools: fix check of multiple commits fixed at once
Cc: Xueming Li <xuemingl at nvidia.com>
[ 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 <thomas at monjalon.net>
Acked-by: Luca Boccassi <bluca at debian.org>
Acked-by: Kevin Traynor <ktraynor at redhat.com>
---
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 () # <origin_hash> ...
{
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 <xuemingl at nvidia.com>
+
+[ upstream commit dbee69686b63fab960a98295a7de542d45de9b6d ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list