[dpdk-stable] patch 'app/testpmd: fix help string for port reset' has been queued to stable release 19.11.10

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.10

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/7ec9ebd3eca1a480104204dfe8f56eb84ace85a4

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 7ec9ebd3eca1a480104204dfe8f56eb84ace85a4 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Fri, 23 Jul 2021 13:24:19 +0100
Subject: [PATCH] app/testpmd: fix help string for port reset

[ upstream commit a2db845cccf4aaab428fbff613a94e8e86418d41 ]

Command help string is missing 'reset' keyword,
although description has it. Adding it.

Fixes: 97f1e196799f ("app/testpmd: add port reset command")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 app/test-pmd/cmdline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 3eedb82486..e6c053ad57 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1324,7 +1324,7 @@ cmdline_parse_token_string_t cmd_operate_port_all_all =
 cmdline_parse_inst_t cmd_operate_port = {
 	.f = cmd_operate_port_parsed,
 	.data = NULL,
-	.help_str = "port start|stop|close all: Start/Stop/Close/Reset all ports",
+	.help_str = "port start|stop|close|reset all: Start/Stop/Close/Reset all ports",
 	.tokens = {
 		(void *)&cmd_operate_port_all_cmd,
 		(void *)&cmd_operate_port_all_port,
@@ -1371,7 +1371,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id =
 cmdline_parse_inst_t cmd_operate_specific_port = {
 	.f = cmd_operate_specific_port_parsed,
 	.data = NULL,
-	.help_str = "port start|stop|close <port_id>: Start/Stop/Close/Reset port_id",
+	.help_str = "port start|stop|close|reset <port_id>: Start/Stop/Close/Reset port_id",
 	.tokens = {
 		(void *)&cmd_operate_specific_port_cmd,
 		(void *)&cmd_operate_specific_port_port,
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:16.480591990 +0200
+++ 0090-app-testpmd-fix-help-string-for-port-reset.patch	2021-08-10 15:11:13.122638850 +0200
@@ -1 +1 @@
-From a2db845cccf4aaab428fbff613a94e8e86418d41 Mon Sep 17 00:00:00 2001
+From 7ec9ebd3eca1a480104204dfe8f56eb84ace85a4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a2db845cccf4aaab428fbff613a94e8e86418d41 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 8468018cf3..905a6143eb 100644
+index 3eedb82486..e6c053ad57 100644
@@ -22 +23 @@
-@@ -1237,7 +1237,7 @@ cmdline_parse_token_string_t cmd_operate_port_all_all =
+@@ -1324,7 +1324,7 @@ cmdline_parse_token_string_t cmd_operate_port_all_all =
@@ -31 +32 @@
-@@ -1284,7 +1284,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id =
+@@ -1371,7 +1371,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id =