patch 'app/testpmd: fix help of create meter command' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.2

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

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

Thanks.

Kevin

---
>From 694f638eb125e5d51525fa7555256dcdbd164b80 Mon Sep 17 00:00:00 2001
From: Jin Liu <jin.liu at corigine.com>
Date: Thu, 28 Apr 2022 04:03:32 +0200
Subject: [PATCH] app/testpmd: fix help of create meter command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit dfffd090c38522fa8859e6c3e41ae6e1313787b7 ]

The help message of create meter command is incomplete,
lack of policy_id param, update help string.

Fixes: f29fa2c59b85 ("app/testpmd: support policy actions per color")

Signed-off-by: Jin Liu <jin.liu at corigine.com>
Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund at corigine.com>
Acked-by: Ferruh Yigit <ferruh.yigit at xilinx.com>
---
 app/test-pmd/cmdline_mtr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
index ad7ef6ad98..a0f885f190 100644
--- a/app/test-pmd/cmdline_mtr.c
+++ b/app/test-pmd/cmdline_mtr.c
@@ -818,6 +818,6 @@ cmdline_parse_inst_t cmd_create_port_meter = {
 	.f = cmd_create_port_meter_parsed,
 	.data = NULL,
-	.help_str = "create port meter <port_id> <mtr_id> <profile_id> <meter_enable>(yes|no) "
-		"<stats_mask> <shared> <use_pre_meter_color> "
+	.help_str = "create port meter <port_id> <mtr_id> <profile_id> <policy_id> "
+		"<meter_enable>(yes|no) <stats_mask> <shared> <use_pre_meter_color> "
 		"[<dscp_tbl_entry0> <dscp_tbl_entry1> ...<dscp_tbl_entry63>]",
 	.tokens = {
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-09 12:34:30.753712338 +0100
+++ 0042-app-testpmd-fix-help-of-create-meter-command.patch	2022-06-09 12:34:29.749980647 +0100
@@ -1 +1 @@
-From dfffd090c38522fa8859e6c3e41ae6e1313787b7 Mon Sep 17 00:00:00 2001
+From 694f638eb125e5d51525fa7555256dcdbd164b80 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit dfffd090c38522fa8859e6c3e41ae6e1313787b7 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org