From 51c8ae5f817c369912dd8b597d224bb562481baf Mon Sep 17 00:00:00 2001
From: Kamal Heib <kheib@redhat.com>
Date: Fri, 17 Apr 2026 11:26:59 -0400
Subject: [PATCH] net: Fix typos

Conflicts:
Include only the mlx5 hunk.

JIRA: https://redhat.atlassian.net/browse/RHEL-169055

commit fe09560f82415d6592e74821e031a76eed173a03
Author: Bjorn Helgaas <bhelgaas@google.com>
Date:   Wed Jul 23 15:15:05 2025 -0500

    net: Fix typos

    Fix typos in comments and error messages.

    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Reviewed-by: David Arinzon <darinzon@amazon.com>
    Reviewed-by: Simon Horman <horms@kernel.org>
    Link: https://patch.msgid.link/20250723201528.2908218-1-helgaas@kernel.org
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Kamal Heib <kheib@redhat.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 130756b1cc94..ebe793bba8dd 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -375,7 +375,7 @@ struct mlx5e_sq_dma {
 	enum mlx5e_dma_map_type type;
 };
 
-/* Keep this enum consistent with with the corresponding strings array
+/* Keep this enum consistent with the corresponding strings array
  * declared in en/reporter_tx.c
  */
 enum {
-- 
2.50.1 (Apple Git-155)