[dpdk-stable] patch 'eal: remove redundant newline in alert message' has been queued to stable release 19.11.4

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri Jul 24 13:58:08 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 d5daa8c70fe9976df76a5f7908dc7540b042791c Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Wed, 10 Jun 2020 16:30:24 +0200
Subject: [PATCH] eal: remove redundant newline in alert message

[ upstream commit d58314aa3ccb57776fbc6d27d024cce4097dd619 ]

rte_eal_init_alert() already appends a newline.

Fixes: 0a529578f162 ("eal: clean up unused files on initialization")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 lib/librte_eal/freebsd/eal/eal.c | 2 +-
 lib/librte_eal/linux/eal/eal.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
index 6ae37e7e6..2a995ee3f 100644
--- a/lib/librte_eal/freebsd/eal/eal.c
+++ b/lib/librte_eal/freebsd/eal/eal.c
@@ -949,7 +949,7 @@ rte_eal_init(int argc, char **argv)
 	 * place, so no cleanup needed.
 	 */
 	if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
-		rte_eal_init_alert("Cannot clear runtime directory\n");
+		rte_eal_init_alert("Cannot clear runtime directory");
 		return -1;
 	}
 
diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
index e6d4cc717..8f1bcab39 100644
--- a/lib/librte_eal/linux/eal/eal.c
+++ b/lib/librte_eal/linux/eal/eal.c
@@ -1288,7 +1288,7 @@ rte_eal_init(int argc, char **argv)
 	 * place, so no cleanup needed.
 	 */
 	if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
-		rte_eal_init_alert("Cannot clear runtime directory\n");
+		rte_eal_init_alert("Cannot clear runtime directory");
 		return -1;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:50.538024271 +0100
+++ 0050-eal-remove-redundant-newline-in-alert-message.patch	2020-07-24 12:53:48.271006162 +0100
@@ -1,25 +1,26 @@
-From d58314aa3ccb57776fbc6d27d024cce4097dd619 Mon Sep 17 00:00:00 2001
+From d5daa8c70fe9976df76a5f7908dc7540b042791c Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Wed, 10 Jun 2020 16:30:24 +0200
 Subject: [PATCH] eal: remove redundant newline in alert message
 
+[ upstream commit d58314aa3ccb57776fbc6d27d024cce4097dd619 ]
+
 rte_eal_init_alert() already appends a newline.
 
 Fixes: 0a529578f162 ("eal: clean up unused files on initialization")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- lib/librte_eal/freebsd/eal.c | 2 +-
- lib/librte_eal/linux/eal.c   | 2 +-
+ lib/librte_eal/freebsd/eal/eal.c | 2 +-
+ lib/librte_eal/linux/eal/eal.c   | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c
-index c41f265fa..00fc66bf7 100644
---- a/lib/librte_eal/freebsd/eal.c
-+++ b/lib/librte_eal/freebsd/eal.c
-@@ -952,7 +952,7 @@ rte_eal_init(int argc, char **argv)
+diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
+index 6ae37e7e6..2a995ee3f 100644
+--- a/lib/librte_eal/freebsd/eal/eal.c
++++ b/lib/librte_eal/freebsd/eal/eal.c
+@@ -949,7 +949,7 @@ rte_eal_init(int argc, char **argv)
  	 * place, so no cleanup needed.
  	 */
  	if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
@@ -27,12 +28,12 @@
 +		rte_eal_init_alert("Cannot clear runtime directory");
  		return -1;
  	}
- 	if (!internal_config.no_telemetry) {
-diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c
-index f162124a3..28a8b7851 100644
---- a/lib/librte_eal/linux/eal.c
-+++ b/lib/librte_eal/linux/eal.c
-@@ -1290,7 +1290,7 @@ rte_eal_init(int argc, char **argv)
+ 
+diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
+index e6d4cc717..8f1bcab39 100644
+--- a/lib/librte_eal/linux/eal/eal.c
++++ b/lib/librte_eal/linux/eal/eal.c
+@@ -1288,7 +1288,7 @@ rte_eal_init(int argc, char **argv)
  	 * place, so no cleanup needed.
  	 */
  	if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
@@ -40,7 +41,7 @@
 +		rte_eal_init_alert("Cannot clear runtime directory");
  		return -1;
  	}
- 	if (!internal_config.no_telemetry) {
+ 
 -- 
 2.20.1
 


More information about the stable mailing list