patch 'devtools: fix regex matching literal plus in patches' has been queued to stable release 24.11.7
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Thu Jun 11 15:19:17 CEST 2026
Hi,
FYI, your patch has been queued to stable release 24.11.7
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/13/26. 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://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/b21acc5bac3026a13c5526368566f17e1d04ef3c
Thanks.
Luca Boccassi
---
>From b21acc5bac3026a13c5526368566f17e1d04ef3c Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 5 May 2026 15:51:21 +0200
Subject: [PATCH] devtools: fix regex matching literal plus in patches
[ upstream commit 28ef4299acfd28df6ddcdad4bbc06916e88108ee ]
In Extended Regular Expressions (ERE) as used in awk,
'+' is a quantifier, not a literal character.
The pattern /^+/ matches the start of any line
instead of only lines beginning with a literal '+'.
As a result, check_experimental_tags and check_internal_tags
were matching context and removed lines in diffs, causing false positives.
Use [+] character class to unambiguously match a literal '+'.
Fixes: cfe3aeb170b2 ("remove experimental tags from all symbol definitions")
Fixes: fba5af82adc8 ("eal: add internal ABI tag definition")
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
devtools/checkpatches.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 4a8591be22..25cf1d8087 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -294,10 +294,10 @@ check_experimental_tags() { # <patch>
current_file = "";
ret = 0;
}
- /^+++ b\// {
+ /^[+][+][+] b\// {
current_file = $2;
}
- /^+.*__rte_experimental/ {
+ /^[+].*__rte_experimental/ {
if (current_file ~ ".c$" ) {
print "Please only put __rte_experimental tags in " \
"headers ("current_file")";
@@ -324,10 +324,10 @@ check_internal_tags() { # <patch>
current_file = "";
ret = 0;
}
- /^+++ b\// {
+ /^[+][+][+] b\// {
current_file = $2;
}
- /^+.*__rte_internal/ {
+ /^[+].*__rte_internal/ {
if (current_file ~ ".c$" ) {
print "Please only put __rte_internal tags in " \
"headers ("current_file")";
--
2.47.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-06-11 14:20:01.708312115 +0100
+++ 0008-devtools-fix-regex-matching-literal-plus-in-patches.patch 2026-06-11 14:20:01.174745010 +0100
@@ -1 +1 @@
-From 28ef4299acfd28df6ddcdad4bbc06916e88108ee Mon Sep 17 00:00:00 2001
+From b21acc5bac3026a13c5526368566f17e1d04ef3c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 28ef4299acfd28df6ddcdad4bbc06916e88108ee ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index 1c6099ac82..f5dd77443f 100755
+index 4a8591be22..25cf1d8087 100755
@@ -29 +30 @@
-@@ -321,10 +321,10 @@ check_experimental_tags() { # <patch>
+@@ -294,10 +294,10 @@ check_experimental_tags() { # <patch>
@@ -42 +43 @@
-@@ -351,10 +351,10 @@ check_internal_tags() { # <patch>
+@@ -324,10 +324,10 @@ check_internal_tags() { # <patch>
More information about the stable
mailing list