From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D4605A0A02 for ; Mon, 17 May 2021 18:16:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFA2041106; Mon, 17 May 2021 18:16:36 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 7DF9240041 for ; Mon, 17 May 2021 18:16:35 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifv0-0008MW-Mp; Mon, 17 May 2021 16:16:34 +0000 From: Christian Ehrhardt To: Chaoyong He Cc: Heinrich Kuhn , dpdk stable Date: Mon, 17 May 2021 18:09:41 +0200 Message-Id: <20210517161039.3132619-152-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix multiport syntax in nfp guide' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- >From 4ea4fd48170be8e620fc7335c21fc0493aaf086d Mon Sep 17 00:00:00 2001 From: Chaoyong He 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 Signed-off-by: Heinrich Kuhn --- 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@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