[dpdk-stable] patch 'doc: fix formatting in testpmd guide' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.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/14/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/8d04d026a749489f754e8230777e2ed3bd06e8ac

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 8d04d026a749489f754e8230777e2ed3bd06e8ac Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Fri, 23 Apr 2021 17:29:44 +0100
Subject: [PATCH] doc: fix formatting in testpmd guide
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit ea2066b13f4df6cbfef313c88e139102fedf9b35 ]

Fix formatting in testpmd user guide for hairpin operation.

Fixes: 01817b10d27c ("app/testpmd: change hairpin queues setup")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Acked-by: Xiaoyun Li <xiaoyun.li at intel.com>
Reviewed-by: Bing Zhao <bingz at nvidia.com>
---
 doc/guides/testpmd_app_ug/run_app.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
index ca67105b70..6f9ff1316b 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -524,8 +524,10 @@ The command line options are:
 
 *   ``--hairpin-mode=0xXX``
 
-    Set the hairpin port mode with bitmask, only valid when hairpin queues number is set.
-    bit 4 - explicit Tx flow rule
-    bit 1 - two hairpin ports paired
-    bit 0 - two hairpin ports loop
+    Set the hairpin port mode with bitmask, only valid when hairpin queues number is set::
+
+	bit 4 - explicit Tx flow rule
+	bit 1 - two hairpin ports paired
+	bit 0 - two hairpin ports loop
+
     The default value is 0. Hairpin will use single port mode and implicit Tx flow mode.
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:57.375752200 +0800
+++ 0026-doc-fix-formatting-in-testpmd-guide.patch	2021-06-12 06:53:56.140000000 +0800
@@ -1 +1 @@
-From ea2066b13f4df6cbfef313c88e139102fedf9b35 Mon Sep 17 00:00:00 2001
+From 8d04d026a749489f754e8230777e2ed3bd06e8ac Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit ea2066b13f4df6cbfef313c88e139102fedf9b35 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index d0621658ae..eb48318353 100644
+index ca67105b70..6f9ff1316b 100644
@@ -22 +24 @@
-@@ -538,8 +538,10 @@ The command line options are:
+@@ -524,8 +524,10 @@ The command line options are: