[dpdk-stable] patch 'app: fix usage help of options separated by dashes' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

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/03/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/eb70a612f4fc54e7e3e85fc4d1e64d6e042176eb

Thanks.

Kevin.

---
>From eb70a612f4fc54e7e3e85fc4d1e64d6e042176eb Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 21 Apr 2020 01:25:31 +0200
Subject: [PATCH] app: fix usage help of options separated by dashes

[ upstream commit a658775c57947a50847c1ca01d39de0b81400678 ]

The EAL options and app-specific options are separated
with double dashes.

The help of testpmd, test-acl and pdump were missing
the dashes after EAL options.
Note: testpmd was completely missing the EAL options.

Fixes: af75078fece3 ("first public release")
Fixes: 26c057ab6c45 ("acl: new test-acl application")
Fixes: b2854d5317e8 ("app/pdump: support multi-core capture")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 app/test-pmd/parameters.c | 2 +-
 test/test-acl/main.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 4d5e28970c..57028c313f 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -53,5 +53,5 @@ static void
 usage(char* progname)
 {
-	printf("usage: %s "
+	printf("usage: %s [EAL options] -- "
 #ifdef RTE_LIBRTE_CMDLINE
 	       "[--interactive|-i] "
diff --git a/test/test-acl/main.c b/test/test-acl/main.c
index 648525af56..420a2c9b99 100644
--- a/test/test-acl/main.c
+++ b/test/test-acl/main.c
@@ -12,5 +12,5 @@
 #include <rte_ip.h>
 
-#define	PRINT_USAGE_START	"%s [EAL options]\n"
+#define	PRINT_USAGE_START	"%s [EAL options] --\n"
 
 #define	RTE_LOGTYPE_TESTACL	RTE_LOGTYPE_USER1
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:03.957434436 +0100
+++ 0093-app-fix-usage-help-of-options-separated-by-dashes.patch	2020-05-28 17:12:59.215553821 +0100
@@ -1 +1 @@
-From a658775c57947a50847c1ca01d39de0b81400678 Mon Sep 17 00:00:00 2001
+From eb70a612f4fc54e7e3e85fc4d1e64d6e042176eb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a658775c57947a50847c1ca01d39de0b81400678 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -21,2 +21,0 @@
- app/pdump/main.c          | 2 +-
- app/test-acl/main.c       | 2 +-
@@ -24 +23,2 @@
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ test/test-acl/main.c      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
@@ -26,22 +25,0 @@
-diff --git a/app/pdump/main.c b/app/pdump/main.c
-index d05a023667..c38c53719e 100644
---- a/app/pdump/main.c
-+++ b/app/pdump/main.c
-@@ -152,5 +152,5 @@ static void
- pdump_usage(const char *prgname)
- {
--	printf("usage: %s [EAL options]"
-+	printf("usage: %s [EAL options] --"
- 			" --["CMD_LINE_OPT_MULTI"]\n"
- 			" --"CMD_LINE_OPT_PDUMP" "
-diff --git a/app/test-acl/main.c b/app/test-acl/main.c
-index 4bc00272f4..0a5dfb621d 100644
---- a/app/test-acl/main.c
-+++ b/app/test-acl/main.c
-@@ -13,5 +13,5 @@
- #include <rte_ip.h>
- 
--#define	PRINT_USAGE_START	"%s [EAL options]\n"
-+#define	PRINT_USAGE_START	"%s [EAL options] --\n"
- 
- #define	RTE_LOGTYPE_TESTACL	RTE_LOGTYPE_USER1
@@ -49 +27 @@
-index 404dba2b20..30c1753c32 100644
+index 4d5e28970c..57028c313f 100644
@@ -52 +30 @@
-@@ -50,5 +50,5 @@ static void
+@@ -53,5 +53,5 @@ static void
@@ -58,0 +37,11 @@
+diff --git a/test/test-acl/main.c b/test/test-acl/main.c
+index 648525af56..420a2c9b99 100644
+--- a/test/test-acl/main.c
++++ b/test/test-acl/main.c
+@@ -12,5 +12,5 @@
+ #include <rte_ip.h>
+ 
+-#define	PRINT_USAGE_START	"%s [EAL options]\n"
++#define	PRINT_USAGE_START	"%s [EAL options] --\n"
+ 
+ #define	RTE_LOGTYPE_TESTACL	RTE_LOGTYPE_USER1