[dpdk-stable] patch 'doc: fix multiport syntax in nfp 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/bfaab1571e54c4028a3f8ef3e98d18209b59aaaf

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From bfaab1571e54c4028a3f8ef3e98d18209b59aaaf Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Thu, 25 Feb 2021 13:46:22 +0200
Subject: [PATCH] doc: fix multiport syntax in nfp guide
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 8202309f9f76b46b1c2e219263a072fe73d21321 ]

Fix up the suffix of the PCI ID to be consistent with the code.

Fixes: 979f2bae0714 ("doc: improve multiport PF in nfp guide")

Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Signed-off-by: Heinrich Kuhn <heinrich.kuhn at netronome.com>
---
 doc/guides/nics/nfp.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst
index fef99973b6..bf8be723b0 100644
--- a/doc/guides/nics/nfp.rst
+++ b/doc/guides/nics/nfp.rst
@@ -117,15 +117,15 @@ although once they are created, DPDK apps should be able to use them as normal
 PCI ports.
 
 NFP ports belonging to same PF can be seen inside PMD initialization with a
-suffix added to the PCI ID: wwww:xx:yy.z_port_n. For example, a PF with PCI ID
+suffix added to the PCI ID: wwww:xx:yy.z_portn. For example, a PF with PCI ID
 0000:03:00.0 and four ports is seen by the PMD code as:
 
    .. code-block:: console
 
-      0000:03:00.0_port_0
-      0000:03:00.0_port_1
-      0000:03:00.0_port_2
-      0000:03:00.0_port_3
+      0000:03:00.0_port0
+      0000:03:00.0_port1
+      0000:03:00.0_port2
+      0000:03:00.0_port3
 
    .. Note::
 
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:57.022729800 +0800
+++ 0013-doc-fix-multiport-syntax-in-nfp-guide.patch	2021-06-12 06:53:56.020000000 +0800
@@ -1 +1 @@
-From 8202309f9f76b46b1c2e219263a072fe73d21321 Mon Sep 17 00:00:00 2001
+From bfaab1571e54c4028a3f8ef3e98d18209b59aaaf Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 8202309f9f76b46b1c2e219263a072fe73d21321 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org