Re: [pull request][net-next V2 00/15] Mellanox, mlx5 updates 2019-04-02

[David Miller <davem@davemloft.net>]

From: Saeed Mahameed <saeedm@mellanox.com>
Date: Fri,  5 Apr 2019 14:17:04 -0700

> This series adds misc updates to mlx5 driver.
> 
> For more information please see tag log below.
> 
> Please pull and let me know if there is any problem.
> 
> v1->v2:
>   remove inline keywords from static functions in c files.

Pulled, thanks Saeed.

The parse_tc_fdb_actions function could use some reverse christmas
tree fixing, just FYI.

> Please note that the series starts with a merge of mlx5-next branch,
> to resolve and avoid dependency with rdma tree.
> 
> Note: when merged with net there is going to be a small merge conflict
> in en_tc.c:
> ++<<<<<<< HEAD
>  +              err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_KERNEL,
>  +                                          parse_attr, hdrs, &action, extack);
> ++=======
> +               err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_FDB,
> +                                           parse_attr, hdrs, extack);
> ++>>>>>>> dave/master
> 
> Resolution:
> +               err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_FDB,
> +                                           parse_attr, hdrs, &action, extack);

Thanks for this, it helped a lot.