patch 'doc: correct name of BlueField-2 in mlx5 guide' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/073988b86273da45ee8933b3970ca709998f3b53

Thanks.

Luca Boccassi

---
>From 073988b86273da45ee8933b3970ca709998f3b53 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Wed, 23 Feb 2022 15:48:32 +0200
Subject: [PATCH] doc: correct name of BlueField-2 in mlx5 guide

[ upstream commit 67e1bb42b95047b8edfdf86bd3cbd6916eeb36d6 ]

Update "BlueField 2" -> "BlueField-2" in mlx5 docs.

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Reviewed-by: Raslan Darawsheh <rasland at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 doc/guides/regexdevs/mlx5.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/guides/regexdevs/mlx5.rst b/doc/guides/regexdevs/mlx5.rst
index faaa6ac11d..fb1693e085 100644
--- a/doc/guides/regexdevs/mlx5.rst
+++ b/doc/guides/regexdevs/mlx5.rst
@@ -7,7 +7,7 @@ MLX5 RegEx driver
 =================
 
 The MLX5 RegEx (Regular Expression) driver library
-(**librte_regex_mlx5**) provides support for **Mellanox BlueField 2**
+(**librte_regex_mlx5**) provides support for **Mellanox BlueField-2**
 families of 25/50/100/200 Gb/s adapters.
 
 Design
@@ -38,13 +38,13 @@ For example: ``class=net:regex`` will probe both the net PMD and the RegEx PMD.
 Supported NICs
 --------------
 
-* Mellanox\ |reg| BlueField 2 SmartNIC
+* Mellanox\ |reg| BlueField-2 SmartNIC
 
 Prerequisites
 -------------
 
-- BlueField 2 running Mellanox supported kernel.
-- Enable the RegEx capabilities using system call from the BlueField 2.
+- BlueField-2 running Mellanox supported kernel.
+- Enable the RegEx capabilities using system call from the BlueField-2.
 - Official support is not yet released.
 
 Run-time configuration
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-28 21:17:57.469424320 +0000
+++ 0044-doc-correct-name-of-BlueField-2-in-mlx5-guide.patch	2022-02-28 21:17:54.024933264 +0000
@@ -1 +1 @@
-From 67e1bb42b95047b8edfdf86bd3cbd6916eeb36d6 Mon Sep 17 00:00:00 2001
+From 073988b86273da45ee8933b3970ca709998f3b53 Mon Sep 17 00:00:00 2001
@@ -6 +6 @@
-Update "BlueField 2" -> "BlueField-2" in mlx5 docs.
+[ upstream commit 67e1bb42b95047b8edfdf86bd3cbd6916eeb36d6 ]
@@ -8 +8 @@
-Cc: stable at dpdk.org
+Update "BlueField 2" -> "BlueField-2" in mlx5 docs.
@@ -14,5 +14,2 @@
- doc/guides/compressdevs/mlx5.rst | 6 +++---
- doc/guides/cryptodevs/mlx5.rst   | 6 +++---
- doc/guides/nics/mlx5.rst         | 2 +-
- doc/guides/regexdevs/mlx5.rst    | 8 ++++----
- 4 files changed, 11 insertions(+), 11 deletions(-)
+ doc/guides/regexdevs/mlx5.rst | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
@@ -20,75 +16,0 @@
-diff --git a/doc/guides/compressdevs/mlx5.rst b/doc/guides/compressdevs/mlx5.rst
-index a4e17f65b3..7f2d6bdfff 100644
---- a/doc/guides/compressdevs/mlx5.rst
-+++ b/doc/guides/compressdevs/mlx5.rst
-@@ -7,7 +7,7 @@ MLX5 compress driver
- ====================
- 
- The MLX5 compress driver library
--(**librte_compress_mlx5**) provides support for **Mellanox BlueField 2**
-+(**librte_compress_mlx5**) provides support for **Mellanox BlueField-2**
- families of 25/50/100/200 Gb/s adapters.
- 
- Design
-@@ -21,7 +21,7 @@ These engines are part of the ARM complex of the BlueField chip, and as
- such they do not use NIC related resources (e.g. RX/TX bandwidth).
- They do share the same PCI and memory bandwidth.
- 
--So, using the BlueField device (starting from BlueField 2), the compress
-+So, using the BlueField device (starting from BlueField-2), the compress
- class operations can be supported in parallel to the net, vDPA and
- RegEx class operations.
- 
-@@ -95,7 +95,7 @@ Driver options
- Supported NICs
- --------------
- 
--* Mellanox\ |reg| BlueField 2 SmartNIC
-+* Mellanox\ |reg| BlueField-2 SmartNIC
- 
- Prerequisites
- -------------
-diff --git a/doc/guides/cryptodevs/mlx5.rst b/doc/guides/cryptodevs/mlx5.rst
-index e86a6205e8..9936556cc9 100644
---- a/doc/guides/cryptodevs/mlx5.rst
-+++ b/doc/guides/cryptodevs/mlx5.rst
-@@ -88,7 +88,7 @@ The mlxreg dedicated tool should be used as follows:
-   should not be specified.
- 
-   All the device ports should set it in order to move to operational mode.
--  For BlueField 2, the internal ports in the ARM system should also be set.
-+  For BlueField-2, the internal ports in the ARM system should also be set.
- 
- - Query CRYPTO_OPERATIONAL register to make sure the device is in Operational
-   mode.
-@@ -142,7 +142,7 @@ Supported NICs
- --------------
- 
- * Mellanox\ |reg| ConnectX\ |reg|-6 200G MCX654106A-HCAT (2x200G)
--* Mellanox\ |reg| BlueField 2 SmartNIC
-+* Mellanox\ |reg| BlueField-2 SmartNIC
- * Mellanox\ |reg| ConnectX\ |reg|-6 Dx
- 
- 
-@@ -162,7 +162,7 @@ FW Prerequisites
- ~~~~~~~~~~~~~~~~
- 
- - xx.31.0328 for ConnectX-6.
--- xx.32.0108 for ConnectX-6 Dx and BlueField 2.
-+- xx.32.0108 for ConnectX-6 Dx and BlueField-2.
- 
- Linux Prerequisites
- ~~~~~~~~~~~~~~~~~~~
-diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
-index c9defd0c60..b7ad55561c 100644
---- a/doc/guides/nics/mlx5.rst
-+++ b/doc/guides/nics/mlx5.rst
-@@ -253,7 +253,7 @@ Limitations
- 
- - Flex item:
- 
--  - Hardware support: BlueField 2.
-+  - Hardware support: BlueField-2.
-   - Flex item is supported on PF only.
-   - Hardware limits ``header_length_mask_width`` up to 6 bits.
-   - Firmware supports 8 global sample fields.
@@ -96 +18 @@
-index b2bf0afd01..fc2cacba60 100644
+index faaa6ac11d..fb1693e085 100644
@@ -108 +30 @@
-@@ -43,13 +43,13 @@ Features
+@@ -38,13 +38,13 @@ For example: ``class=net:regex`` will probe both the net PMD and the RegEx PMD.
@@ -124 +46 @@
- Limitations
+ Run-time configuration