patch 'common/mlx5: fix variable shadowing' has been queued to stable release 25.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 25.11.1

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/26. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/80f56bd29847a6010e621f8341d00dd83fd21d22

Thanks.

Kevin

---
>From 80f56bd29847a6010e621f8341d00dd83fd21d22 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Wed, 21 Jan 2026 12:06:00 +0100
Subject: [PATCH] common/mlx5: fix variable shadowing

[ upstream commit 2a9bcc306094e721b58af4887a5a1c887afcd4f4 ]

The word "unused" is too common for being used in a header.
There is a warning because a parameter is named "unused" in mbuf:

lib/mbuf/rte_mbuf.h: In function 'rte_mbuf_tx_offload':
error: declaration of 'unused' shadows a previous local [-Werror=shadow]
 1910 |         uint64_t ol3, uint64_t ol2, uint64_t unused)
      |                                     ~~~~~~~~~^~~~~~

Such value should be prefixed with "MLX5".

Fixes: bd935fe3e624 ("net/mlx5: wrap sampling actions per OS")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: David Marchand <david.marchand at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/common/mlx5/windows/mlx5_glue.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/mlx5/windows/mlx5_glue.h b/drivers/common/mlx5/windows/mlx5_glue.h
index 5ba324ebc4..f53142e3d4 100644
--- a/drivers/common/mlx5/windows/mlx5_glue.h
+++ b/drivers/common/mlx5/windows/mlx5_glue.h
@@ -17,5 +17,5 @@
 
 #ifndef HAVE_MLX5DV_DR
-enum  mlx5dv_dr_domain_type { unused, };
+enum  mlx5dv_dr_domain_type { MLX5_UNUSED_DOMAIN_TYPE };
 struct mlx5dv_dr_domain;
 struct mlx5dv_dr_action;
-- 
2.53.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-02-26 10:16:48.112310183 +0000
+++ 0025-common-mlx5-fix-variable-shadowing.patch	2026-02-26 10:16:46.926540254 +0000
@@ -1 +1 @@
-From 2a9bcc306094e721b58af4887a5a1c887afcd4f4 Mon Sep 17 00:00:00 2001
+From 80f56bd29847a6010e621f8341d00dd83fd21d22 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2a9bcc306094e721b58af4887a5a1c887afcd4f4 ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org