patch 'doc: add kernel options required for mlx5' has been queued to stable release 23.11.5

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.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 06/28/25. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=87853e3523bd30dd0f4f3b733f5d485a3eb95c25

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 87853e3523bd30dd0f4f3b733f5d485a3eb95c25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarom=C3=ADr=20Smr=C4=8Dek?= <4plague at gmail.com>
Date: Tue, 10 Jun 2025 10:02:43 +0300
Subject: [PATCH] doc: add kernel options required for mlx5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 3101799fce0016061ff7aa9c3c2ad7155aff1073 ]

On some kernels (Debian 6.6, 6.9 and 6.10 tested),
there is a missing option for "TC recirculation"
that prevents MLX5 driver to include CONFIG_MLX5_CLS_ACT
in the compilation, thus preventing PF1
from properly working in multiport-eswitch mode.

Fixes: 11c73de9ef63 ("net/mlx5: probe multi-port E-Switch device")

Signed-off-by: Jaromír Smrček <4plague at gmail.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
 .mailmap                 | 1 +
 doc/guides/nics/mlx5.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index b1e5e00cb7..e0202fab03 100644
--- a/.mailmap
+++ b/.mailmap
@@ -605,6 +605,7 @@ Jan Medala <jan.medala at outlook.com> <jan at semihalf.com>
 Jan Remes <remes at netcope.com>
 Jan Viktorin <viktorin at cesnet.cz> <viktorin at rehivetech.com>
 Jan Wickbom <jan.wickbom at ericsson.com>
+Jaromír Smrček <4plague at gmail.com>
 Jaroslaw Gawin <jaroslawx.gawin at intel.com>
 Jaroslaw Ilgiewicz <jaroslaw.ilgiewicz at intel.com>
 Jason He <jason.he at broadcom.com>
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index d1c3284ca1..7c9e0350d4 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -1485,7 +1485,7 @@ Supported HCAs:
 
 Supported mlx5 kernel modules versions:
 
-- Upstream Linux - from version 6.3.
+- Upstream Linux - from version 6.3 with CONFIG_NET_TC_SKB_EXT and CONFIG_MLX5_CLS_ACT enabled.
 - Modules packaged in MLNX_OFED - from version v23.04-0.5.3.3.
 
 Configuration
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-26 19:59:20.749784004 +0800
+++ 0081-doc-add-kernel-options-required-for-mlx5.patch	2025-06-26 19:59:17.518418038 +0800
@@ -1 +1 @@
-From 3101799fce0016061ff7aa9c3c2ad7155aff1073 Mon Sep 17 00:00:00 2001
+From 87853e3523bd30dd0f4f3b733f5d485a3eb95c25 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 3101799fce0016061ff7aa9c3c2ad7155aff1073 ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -26 +28 @@
-index 3dec1492aa..8483d96ec5 100644
+index b1e5e00cb7..e0202fab03 100644
@@ -29 +31,3 @@
-@@ -645,6 +645,7 @@ Jan Viktorin <viktorin at cesnet.cz> <viktorin at rehivetech.com>
+@@ -605,6 +605,7 @@ Jan Medala <jan.medala at outlook.com> <jan at semihalf.com>
+ Jan Remes <remes at netcope.com>
+ Jan Viktorin <viktorin at cesnet.cz> <viktorin at rehivetech.com>
@@ -31,2 +34,0 @@
- Jananee Parthasarathy <jananeex.m.parthasarathy at intel.com>
- Janardhanan Arumugam <janardhanan.arumugam at intel.com>
@@ -38 +40 @@
-index 9957802d44..c1dcb9ca68 100644
+index d1c3284ca1..7c9e0350d4 100644
@@ -41 +43 @@
-@@ -1761,7 +1761,7 @@ Supported HCAs:
+@@ -1485,7 +1485,7 @@ Supported HCAs: