[dpdk-stable] patch 'net/failsafe: fix double space in warning log' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Oct 28 11:42:42 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 73af0c03945b0524c5efac446a7f60c8c0c78e11 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Fri, 14 Aug 2020 10:39:33 -0700
Subject: [PATCH] net/failsafe: fix double space in warning log

[ upstream commit 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd ]

Already get a newline from WARN() macro call.

Fixes: 9dda3e3393c2 ("net/failsafe: add timestamp to stats snapshot")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Gaetan Rivet <grive at u256.net>
---
 drivers/net/failsafe/failsafe_ether.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 93deacd134..6c27645b96 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -322,10 +322,10 @@ fs_dev_stats_save(struct sub_device *sdev)
 	if (err) {
 		uint64_t timestamp = sdev->stats_snapshot.timestamp;
 
-		WARN("Could not access latest statistics from sub-device %d.\n",
+		WARN("Could not access latest statistics from sub-device %d.",
 			 SUB_ID(sdev));
 		if (timestamp != 0)
-			WARN("Using latest snapshot taken before %"PRIu64" seconds.\n",
+			WARN("Using latest snapshot taken before %"PRIu64" seconds.",
 				 (rte_rdtsc() - timestamp) / rte_get_tsc_hz());
 	}
 	failsafe_stats_increment
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:11.889741463 +0000
+++ 0003-net-failsafe-fix-double-space-in-warning-log.patch	2020-10-28 10:35:11.380828199 +0000
@@ -1,12 +1,13 @@
-From 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd Mon Sep 17 00:00:00 2001
+From 73af0c03945b0524c5efac446a7f60c8c0c78e11 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen at networkplumber.org>
 Date: Fri, 14 Aug 2020 10:39:33 -0700
 Subject: [PATCH] net/failsafe: fix double space in warning log
 
+[ upstream commit 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd ]
+
 Already get a newline from WARN() macro call.
 
 Fixes: 9dda3e3393c2 ("net/failsafe: add timestamp to stats snapshot")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 Acked-by: Gaetan Rivet <grive at u256.net>
@@ -15,7 +16,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
-index 2b748bd8b4..70972d6717 100644
+index 93deacd134..6c27645b96 100644
 --- a/drivers/net/failsafe/failsafe_ether.c
 +++ b/drivers/net/failsafe/failsafe_ether.c
 @@ -322,10 +322,10 @@ fs_dev_stats_save(struct sub_device *sdev)


More information about the stable mailing list