patch 'doc: update matching versions in ice 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 02/20/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/29649b45905936893920d4fbe5ef10553c92943d

Thanks.

Luca Boccassi

---
>From 29649b45905936893920d4fbe5ef10553c92943d Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Tue, 25 Jan 2022 09:26:11 +0800
Subject: [PATCH] doc: update matching versions in ice guide

[ upstream commit affa9de4747d3fc8b827a51211e9d3020f658574 ]

Add recommended matching list for ice PMD in DPDK 21.08 and DPDK 21.11.

Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Junfeng Guo <junfeng.guo at intel.com>
---
 doc/guides/nics/ice.rst | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index 7b5a1bf157..2df7ceceb3 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -34,11 +34,19 @@ to avoid the compatibility issues with ice PMD.
 Here is the suggested matching list which has been tested and verified.
 The detailed information can refer to chapter Tested Platforms/Tested NICs in release notes.
 
-   +-----------+---------------+-----------------+-----------+-----------+
-   |    DPDK   | Kernel Driver | OS Default DDP  | COMMS DDP | Firmware  |
-   +===========+===============+=================+===========+===========+
-   |    20.11  |     1.3.2     |      1.3.20     |  1.3.24   |    2.3    |
-   +-----------+---------------+-----------------+-----------+-----------+
+   +-----------+---------------+-----------------+-----------+--------------+-----------+
+   |    DPDK   | Kernel Driver | OS Default DDP  | COMMS DDP | Wireless DDP | Firmware  |
+   +===========+===============+=================+===========+==============+===========+
+   |    20.11  |     1.3.2     |      1.3.20     |  1.3.24   |      N/A     |    2.3    |
+   +-----------+---------------+-----------------+-----------+--------------+-----------+
+   |    21.02  |     1.4.11    |      1.3.24     |  1.3.28   |    1.3.4     |    2.4    |
+   +-----------+---------------+-----------------+-----------+--------------+-----------+
+   |    21.05  |     1.6.5     |      1.3.26     |  1.3.30   |    1.3.6     |    3.0    |
+   +-----------+---------------+-----------------+-----------+--------------+-----------+
+   |    21.08  |     1.7.16    |      1.3.27     |  1.3.31   |    1.3.7     |    3.1    |
+   +-----------+---------------+-----------------+-----------+--------------+-----------+
+   |    21.11  |     1.7.16    |      1.3.27     |  1.3.31   |    1.3.7     |    3.1    |
+   +-----------+---------------+-----------------+-----------+--------------+-----------+
 
 Pre-Installation Configuration
 ------------------------------
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-18 12:37:40.572608922 +0000
+++ 0067-doc-update-matching-versions-in-ice-guide.patch	2022-02-18 12:37:37.738792992 +0000
@@ -1 +1 @@
-From affa9de4747d3fc8b827a51211e9d3020f658574 Mon Sep 17 00:00:00 2001
+From 29649b45905936893920d4fbe5ef10553c92943d Mon Sep 17 00:00:00 2001
@@ -6 +6 @@
-Add recommended matching list for ice PMD in DPDK 21.08 and DPDK 21.11.
+[ upstream commit affa9de4747d3fc8b827a51211e9d3020f658574 ]
@@ -8 +8 @@
-Cc: stable at dpdk.org
+Add recommended matching list for ice PMD in DPDK 21.08 and DPDK 21.11.
@@ -13,2 +13,2 @@
- doc/guides/nics/ice.rst | 4 ++++
- 1 file changed, 4 insertions(+)
+ doc/guides/nics/ice.rst | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
@@ -17 +17 @@
-index f95fef8cf0..a1780c46c3 100644
+index 7b5a1bf157..2df7ceceb3 100644
@@ -20,4 +20,18 @@
-@@ -58,6 +58,10 @@ The detailed information can refer to chapter Tested Platforms/Tested NICs in re
-    +-----------+---------------+-----------------+-----------+--------------+-----------+
-    |    21.05  |     1.6.5     |      1.3.26     |  1.3.30   |    1.3.6     |    3.0    |
-    +-----------+---------------+-----------------+-----------+--------------+-----------+
+@@ -34,11 +34,19 @@ to avoid the compatibility issues with ice PMD.
+ Here is the suggested matching list which has been tested and verified.
+ The detailed information can refer to chapter Tested Platforms/Tested NICs in release notes.
+ 
+-   +-----------+---------------+-----------------+-----------+-----------+
+-   |    DPDK   | Kernel Driver | OS Default DDP  | COMMS DDP | Firmware  |
+-   +===========+===============+=================+===========+===========+
+-   |    20.11  |     1.3.2     |      1.3.20     |  1.3.24   |    2.3    |
+-   +-----------+---------------+-----------------+-----------+-----------+
++   +-----------+---------------+-----------------+-----------+--------------+-----------+
++   |    DPDK   | Kernel Driver | OS Default DDP  | COMMS DDP | Wireless DDP | Firmware  |
++   +===========+===============+=================+===========+==============+===========+
++   |    20.11  |     1.3.2     |      1.3.20     |  1.3.24   |      N/A     |    2.3    |
++   +-----------+---------------+-----------------+-----------+--------------+-----------+
++   |    21.02  |     1.4.11    |      1.3.24     |  1.3.28   |    1.3.4     |    2.4    |
++   +-----------+---------------+-----------------+-----------+--------------+-----------+
++   |    21.05  |     1.6.5     |      1.3.26     |  1.3.30   |    1.3.6     |    3.0    |
++   +-----------+---------------+-----------------+-----------+--------------+-----------+