Subject: linux-next: build failure after merge of the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 22 Oct 2021 11:24:36 +1100

Hi all,

After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:71:10: fatal error: lag.h: No such file or directory
   71 | #include "lag.h"
      |          ^~~~~~~
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c:13:10: fatal error: lag.h: No such file or directory
   13 | #include "lag.h"
      |          ^~~~~~~

Caused by commit

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

interacting with commit

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

from the net tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <[email-masked]>
Date: Fri, 22 Oct 2021 11:10:06 +1100
Subject: [PATCH] fixup for "net/mlx5: Lag, move lag files into directory"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 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(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index b7461c17d601..d7e613d0139a 100644
--- 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;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 57369925a788..3af3da214a5b 100644
--- 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)
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell