[dpdk-stable] patch 'doc: fix EF10 Rx mode name in sfc guide' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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.

Thanks.

Luca Boccassi

---
>From 0761181778c5a055841861f2fb50ad0a5949f3cc Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko at solarflare.com>
Date: Tue, 13 Oct 2020 14:45:18 +0100
Subject: [PATCH] doc: fix EF10 Rx mode name in sfc guide

[ upstream commit e1ecb6c775c81553750853f894a8655781a91cef ]

Fixes: 390f9b8d82c9 ("net/sfc: support equal stride super-buffer Rx mode")

Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 doc/guides/nics/sfc_efx.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst
index 67d9b054d5..f79ebf518c 100644
--- a/doc/guides/nics/sfc_efx.rst
+++ b/doc/guides/nics/sfc_efx.rst
@@ -295,7 +295,7 @@ whitelist option like "-w 02:00.0,arg1=value1,...".
 Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
 boolean parameters value.
 
-- ``rx_datapath`` [auto|efx|ef10|ef10_esps] (default **auto**)
+- ``rx_datapath`` [auto|efx|ef10|ef10_essb] (default **auto**)
 
   Choose receive datapath implementation.
   **auto** allows the driver itself to make a choice based on firmware
@@ -304,7 +304,7 @@ boolean parameters value.
   **ef10** chooses EF10 (SFN7xxx, SFN8xxx, X2xxx) native datapath which is
   more efficient than libefx-based and provides richer packet type
   classification.
-  **ef10_esps** chooses SFNX2xxx equal stride packed stream datapath
+  **ef10_essb** chooses SFNX2xxx equal stride super-buffer datapath
   which may be used on DPDK firmware variant only
   (see notes about its limitations above).
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:17.238874420 +0000
+++ 0178-doc-fix-EF10-Rx-mode-name-in-sfc-guide.patch	2020-10-28 10:35:11.784834145 +0000
@@ -1,10 +1,11 @@
-From e1ecb6c775c81553750853f894a8655781a91cef Mon Sep 17 00:00:00 2001
+From 0761181778c5a055841861f2fb50ad0a5949f3cc Mon Sep 17 00:00:00 2001
 From: Andrew Rybchenko <arybchenko at solarflare.com>
 Date: Tue, 13 Oct 2020 14:45:18 +0100
 Subject: [PATCH] doc: fix EF10 Rx mode name in sfc guide
 
+[ upstream commit e1ecb6c775c81553750853f894a8655781a91cef ]
+
 Fixes: 390f9b8d82c9 ("net/sfc: support equal stride super-buffer Rx mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
 ---
@@ -12,10 +13,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst
-index ab44ce66c8..812c1e7951 100644
+index 67d9b054d5..f79ebf518c 100644
 --- a/doc/guides/nics/sfc_efx.rst
 +++ b/doc/guides/nics/sfc_efx.rst
-@@ -297,7 +297,7 @@ whitelist option like "-w 02:00.0,arg1=value1,...".
+@@ -295,7 +295,7 @@ whitelist option like "-w 02:00.0,arg1=value1,...".
  Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
  boolean parameters value.
  
@@ -24,7 +25,7 @@
  
    Choose receive datapath implementation.
    **auto** allows the driver itself to make a choice based on firmware
-@@ -306,7 +306,7 @@ boolean parameters value.
+@@ -304,7 +304,7 @@ boolean parameters value.
    **ef10** chooses EF10 (SFN7xxx, SFN8xxx, X2xxx) native datapath which is
    more efficient than libefx-based and provides richer packet type
    classification.