From: Jakub Kicinski <kuba@kernel.org>

Date: Fri, 22 Oct 2021 08:51:45 -0700

Subject: mlx5: fix build after merge

Patch-mainline: v5.16-rc1

Git-commit: 016c89460d348c405313019bffeb73971e35ed09

References: jsc#SLE-19253

Silent merge conflict between these two:

  3d677735d3b7 ("net/mlx5: Lag, move lag files into directory")

  14fe2471c628 ("net/mlx5: Lag, change multipath and bonding to be mutually exclusive")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c |    4 ++--

 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c     |    4 ++--

 2 files changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

@@ -10,8 +10,8 @@

 #include "en_tc.h"

 #include "rep/tc.h"

 #include "rep/neigh.h"

-#include "lag.h"

-#include "lag_mp.h"

+#include "lag/lag.h"

+#include "lag/mp.h"

 struct mlx5e_tc_tun_route_attr {

 	struct net_device *out_dev;

--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

@@ -68,8 +68,8 @@

 #include "lib/fs_chains.h"

 #include "diag/en_tc_tracepoint.h"

 #include <asm/div64.h>

-#include "lag.h"

-#include "lag_mp.h"

+#include "lag/lag.h"

+#include "lag/mp.h"

 #define nic_chains(priv) ((priv)->fs.tc.chains)

 #define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)