[dpdk-stable] patch 'devtools: fix path in forbidden token check' has been queued to stable release 19.11.4

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri Jul 24 13:58:35 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.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 07/26/20. 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.

Thanks.

Luca Boccassi

---
>From d1d309474c4b718655da73d6330cced02d4bd6bf Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 6 Jul 2020 10:00:21 +0200
Subject: [PATCH] devtools: fix path in forbidden token check

[ upstream commit 8d4a222e12f8ce99714fad5011d76bd6a38c36e3 ]

Fix displayed filename by adjusting the extraction from the patch.

Before:
Warning in /lib/librte_eal/linux/eal.c:

After:
Warning in lib/librte_eal/linux/eal.c:

Fixes: 7413e7f2aeb3 ("devtools: alert on new calls to exit from libs")

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 devtools/check-forbidden-tokens.awk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/check-forbidden-tokens.awk b/devtools/check-forbidden-tokens.awk
index 8c89de3d4..f86cbe8dc 100755
--- a/devtools/check-forbidden-tokens.awk
+++ b/devtools/check-forbidden-tokens.awk
@@ -62,7 +62,7 @@ BEGIN {
 }
 END {
 	if (count > 0) {
-		print "Warning in " substr(last_file,6) ":"
+		print "Warning in " substr(last_file,7) ":"
 		print MESSAGE
 		exit RET_ON_FAIL
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:51.535683292 +0100
+++ 0077-devtools-fix-path-in-forbidden-token-check.patch	2020-07-24 12:53:48.299006683 +0100
@@ -1,8 +1,10 @@
-From 8d4a222e12f8ce99714fad5011d76bd6a38c36e3 Mon Sep 17 00:00:00 2001
+From d1d309474c4b718655da73d6330cced02d4bd6bf Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Mon, 6 Jul 2020 10:00:21 +0200
 Subject: [PATCH] devtools: fix path in forbidden token check
 
+[ upstream commit 8d4a222e12f8ce99714fad5011d76bd6a38c36e3 ]
+
 Fix displayed filename by adjusting the extraction from the patch.
 
 Before:
@@ -12,7 +14,6 @@
 Warning in lib/librte_eal/linux/eal.c:
 
 Fixes: 7413e7f2aeb3 ("devtools: alert on new calls to exit from libs")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 ---


More information about the stable mailing list