[dpdk-stable] patch 'app: remove extra new line after link duplex' has been queued to stable release 19.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue May 19 15:05:47 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 83e7cafc27ee757115ae709756dac35d8723497a Mon Sep 17 00:00:00 2001
From: Ivan Dyukov <i.dyukov at samsung.com>
Date: Thu, 7 May 2020 21:26:01 +0300
Subject: [PATCH] app: remove extra new line after link duplex

[ upstream commit a357d09d54246ea72625c22a970d81a3165fbf94 ]

This is testpmd part of new line cleanup.

Fixes: 002ade70e9 ("app/test: measure cycles per packet in Rx/Tx")
Fixes: ce8d561418 ("app/testpmd: add port configuration settings")

Signed-off-by: Ivan Dyukov <i.dyukov at samsung.com>
Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 app/test-pmd/testpmd.c   | 2 +-
 app/test/test_pmd_perf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 31361e4996..46d0f1c875 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2752,7 +2752,7 @@ check_all_ports_link_status(uint32_t port_mask)
 					"Port%d Link Up. speed %u Mbps- %s\n",
 					portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
 				continue;
diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
index d61be58bb3..352cd47156 100644
--- a/app/test/test_pmd_perf.c
+++ b/app/test/test_pmd_perf.c
@@ -151,7 +151,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 					"Port%d Link Up. Speed %u Mbps - %s\n",
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 					if (link_mbps == 0)
 						link_mbps = link.link_speed;
 				} else
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:53.244804328 +0100
+++ 0212-app-remove-extra-new-line-after-link-duplex.patch	2020-05-19 14:04:44.612655551 +0100
@@ -1,13 +1,14 @@
-From a357d09d54246ea72625c22a970d81a3165fbf94 Mon Sep 17 00:00:00 2001
+From 83e7cafc27ee757115ae709756dac35d8723497a Mon Sep 17 00:00:00 2001
 From: Ivan Dyukov <i.dyukov at samsung.com>
 Date: Thu, 7 May 2020 21:26:01 +0300
 Subject: [PATCH] app: remove extra new line after link duplex
 
+[ upstream commit a357d09d54246ea72625c22a970d81a3165fbf94 ]
+
 This is testpmd part of new line cleanup.
 
 Fixes: 002ade70e9 ("app/test: measure cycles per packet in Rx/Tx")
 Fixes: ce8d561418 ("app/testpmd: add port configuration settings")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ivan Dyukov <i.dyukov at samsung.com>
 Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -17,10 +18,10 @@
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
-index 4b13bf6a98..9cbe6e9f68 100644
+index 31361e4996..46d0f1c875 100644
 --- a/app/test-pmd/testpmd.c
 +++ b/app/test-pmd/testpmd.c
-@@ -3012,7 +3012,7 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -2752,7 +2752,7 @@ check_all_ports_link_status(uint32_t port_mask)
  					"Port%d Link Up. speed %u Mbps- %s\n",
  					portid, link.link_speed,
  				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?


More information about the stable mailing list