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

Kevin Traynor ktraynor at redhat.com
Thu Nov 5 13:39:09 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/10/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ecd5ec5a59a512964333d91ebf474dbd578f656a

Thanks.

Kevin.

---
>From ecd5ec5a59a512964333d91ebf474dbd578f656a 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 2ff234ea3a..3e1f65f09a 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -313,8 +313,8 @@ fs_dev_stats_save(struct sub_device *sdev)
 		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());
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.313628296 +0000
+++ 0002-net-failsafe-fix-double-space-in-warning-log.patch	2020-11-05 12:38:54.136895939 +0000
@@ -1 +1 @@
-From 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd Mon Sep 17 00:00:00 2001
+From ecd5ec5a59a512964333d91ebf474dbd578f656a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 2b748bd8b4..70972d6717 100644
+index 2ff234ea3a..3e1f65f09a 100644
@@ -21 +22 @@
-@@ -323,8 +323,8 @@ fs_dev_stats_save(struct sub_device *sdev)
+@@ -313,8 +313,8 @@ fs_dev_stats_save(struct sub_device *sdev)



More information about the stable mailing list