Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/infiniband/hw/mlx5/flow.c: In function 'mlx5_ib_handler_MLX5_IB_METHOD_CREATE_FLOW': drivers/infiniband/hw/mlx5/flow.c:163:12: error: 'struct mlx5_flow_act' has no member named 'has_flow_tag'; did you mean 'flow_tag'? flow_act.has_flow_tag = true; ^~~~~~~~~~~~ flow_tag Caused by commit d5634fee245f ("net/mlx5: Add a no-append flow insertion mode") interacting with commit ba4a41198324 ("RDMA/mlx5: Add support for flow tag to raw create flow") from the rdma tree. I have applied the following merge fix patch for today: From: Stephen Rothwell Date: Fri, 19 Oct 2018 11:10:39 +1100 Subject: [PATCH] net/mlx5: fix up for has_flow_tag changing to a flag Signed-off-by: Stephen Rothwell --- drivers/infiniband/hw/mlx5/flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c index e57435cb6d96..f86cdcafdafc 100644 --- a/drivers/infiniband/hw/mlx5/flow.c +++ b/drivers/infiniband/hw/mlx5/flow.c @@ -160,7 +160,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)( ret = -EINVAL; goto err_out; } - flow_act.has_flow_tag = true; + flow_act.flags |= FLOW_ACT_HAS_TAG; } flow_handler = mlx5_ib_raw_fs_rule_add(dev, fs_matcher, &flow_act, -- 2.18.0 -- Cheers, Stephen Rothwell