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

From: Saeed Mahameed <[email-masked]>
Date: Thu, 28 Oct 2021 07:45:53 +0000

On Thu, 2021-10-28 at 12:56 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from
> drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h:11,
>                  from
> drivers/net/ethernet/mellanox/mlx5/core/eswitch.h:48,
>                  from
> drivers/net/ethernet/mellanox/mlx5/core/main.c:59:
> drivers/net/ethernet/mellanox/mlx5/core/en.h:646:24: error: field
> 'mkey' has incomplete type
>   646 |  struct mlx5_core_mkey mkey;
>       |                        ^~~~
> In file included from
> drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h:11,
>                  from
> drivers/net/ethernet/mellanox/mlx5/core/eswitch.h:48,
>                  from drivers/net/ethernet/mellanox/mlx5/core/eq.c:18:
> drivers/net/ethernet/mellanox/mlx5/core/en.h:646:24: error: field
> 'mkey' has incomplete type
>   646 |  struct mlx5_core_mkey mkey;
>       |                        ^~~~
> drivers/net/ethernet/mellanox/mlx5/core/en_rx.c: In function
> 'mlx5e_build_shampo_hd_umr':
> drivers/net/ethernet/mellanox/mlx5/core/en_rx.c:547:45: error: request
> for member 'key' in something not a structure or union
>   547 |  u32 lkey = rq->mdev->mlx5e_res.hw_objs.mkey.key;
>       |                                             ^
> 
> Caused by commits
> 
>   e5ca8fb08ab2 ("net/mlx5e: Add control path for SHAMPO feature")
>   64509b052525 ("net/mlx5e: Add data path for SHAMPO feature")
> 
> interacting with commit
> 
>   83fec3f12a59 ("RDMA/mlx5: Replace struct mlx5_core_mkey by u32 key")
> 
> from the rmda tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <[email-masked]>
> Date: Thu, 28 Oct 2021 12:36:29 +1100
> Subject: [PATCH] fixup for "RDMA/mlx5: Replace struct mlx5_core_mkey by
> u32 key"
> 
> Signed-off-by: Stephen Rothwell <[email-masked]>
> ---

Hi Stephen, 
the merge conflict and build failure can be avoided by the following
merge commit to net-next, already sent to Dave, hope it will be merge
in net-next soon

https://lore.kernel.org/netdev/[email-masked]/T/#u