[dpdk-stable] patch 'doc: fix multiport syntax in nfp guide' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.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 05/19/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/4ea4fd48170be8e620fc7335c21fc0493aaf086d

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 4ea4fd48170be8e620fc7335c21fc0493aaf086d 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

[ 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 020e37d131..7d8ed38bca 100644
--- a/doc/guides/nics/nfp.rst
+++ b/doc/guides/nics/nfp.rst
@@ -121,15 +121,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.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:35.362770187 +0200
+++ 0152-doc-fix-multiport-syntax-in-nfp-guide.patch	2021-05-17 17:40:29.427811493 +0200
@@ -1 +1 @@
-From 8202309f9f76b46b1c2e219263a072fe73d21321 Mon Sep 17 00:00:00 2001
+From 4ea4fd48170be8e620fc7335c21fc0493aaf086d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8202309f9f76b46b1c2e219263a072fe73d21321 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index fef99973b6..bf8be723b0 100644
+index 020e37d131..7d8ed38bca 100644
@@ -21 +22 @@
-@@ -117,15 +117,15 @@ although once they are created, DPDK apps should be able to use them as normal
+@@ -121,15 +121,15 @@ although once they are created, DPDK apps should be able to use them as normal