patch 'devtools: fix escaped space in grep pattern' has been queued to stable release 21.11.4
Kevin Traynor
ktraynor at redhat.com
Thu Feb 23 16:04:55 CET 2023
Hi,
FYI, your patch has been queued to stable release 21.11.4
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/28/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://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/17817f916b5c83d3475a9ada7d6c58484e7e01f3
Thanks.
Kevin
---
>From 17817f916b5c83d3475a9ada7d6c58484e7e01f3 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 10 Jan 2023 22:23:27 +0100
Subject: [PATCH] devtools: fix escaped space in grep pattern
[ upstream commit 7f6b150cb79dad10b82fe004e5b2310e39507381 ]
Since grep 3.8, a warning is printed if a space is escaped in a pattern:
grep: warning: stray \ before white space
There was an occurence of such extra backslash in check-git-log.sh.
Fixes: d448efa259e9 ("devtools: export dictionary for commit title check")
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
devtools/check-git-log.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index 23c6a7d9bb..cfdc7f63a6 100755
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -120,5 +120,5 @@ for word in $(cat $words); do
bad=$(echo "$headlines" | grep -iw $word | grep -vw $word)
if [ "$word" = "Tx" ]; then
- bad=$(echo $bad | grep -v 'OCTEON\ TX')
+ bad=$(echo $bad | grep -v 'OCTEON TX')
fi
for bad_line in $bad; do
--
2.39.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-02-23 14:46:23.973505951 +0000
+++ 0004-devtools-fix-escaped-space-in-grep-pattern.patch 2023-02-23 14:46:23.697235712 +0000
@@ -1 +1 @@
-From 7f6b150cb79dad10b82fe004e5b2310e39507381 Mon Sep 17 00:00:00 2001
+From 17817f916b5c83d3475a9ada7d6c58484e7e01f3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7f6b150cb79dad10b82fe004e5b2310e39507381 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 01d8aa0717..e26205814b 100755
+index 23c6a7d9bb..cfdc7f63a6 100755
@@ -24 +25 @@
-@@ -121,5 +121,5 @@ for word in $(cat $words); do
+@@ -120,5 +120,5 @@ for word in $(cat $words); do
More information about the stable
mailing list