Re: [pull request][net 00/12] Mellanox, mlx5 fixes 2019-08-08

[David Miller <davem@davemloft.net>]

From: Saeed Mahameed <saeedm@mellanox.com>
Date: Thu, 8 Aug 2019 20:21:58 +0000

> This series introduces some fixes to mlx5 driver.
> 
> Highlights:
> 1) From Tariq, Critical mlx5 kTLS fixes to better align with hw specs.
> 2) From Aya, Fixes to mlx5 tx devlink health reporter.
> 3) From Maxim, aRFs parsing to use flow dissector to avoid relying on
> invalid skb fields.
> 
> Please pull and let me know if there is any problem.

Pulled.

> For -stable v4.3
>  ('net/mlx5e: Only support tx/rx pause setting for port owner')
> For -stable v4.9
>  ('net/mlx5e: Use flow keys dissector to parse packets for ARFS')
> For -stable v5.1
>  ('net/mlx5e: Fix false negative indication on tx reporter CQE recovery')
>  ('net/mlx5e: Remove redundant check in CQE recovery flow of tx reporter')
>  ('net/mlx5e: ethtool, Avoid setting speed to 56GBASE when autoneg off')

Queued up.

> Note: when merged with net-next this minor conflict will pop up:
> ++<<<<<<< (net-next)
>  +      if (is_eswitch_flow) {
>  +              flow->esw_attr->match_level = match_level;
>  +              flow->esw_attr->tunnel_match_level = tunnel_match_level;
> ++=======
> +       if (flow->flags & MLX5E_TC_FLOW_ESWITCH) {
> +               flow->esw_attr->inner_match_level = inner_match_level;
> +               flow->esw_attr->outer_match_level = outer_match_level;
> ++>>>>>>> (net)
> 
> To resolve, use hunks from net (2nd) and replace:
> if (flow->flags & MLX5E_TC_FLOW_ESWITCH) 
> with
> if (is_eswitch_flow)

Thanks for this.