From: Saeed Mahameed <sae...@mellanox.com>
Date: Thu, 11 Jul 2019 18:54:08 +0000

> This series introduces some fixes to mlx5 driver.
> 
> Please pull and let me know if there is any problem.

Pulled.

> For -stable v4.15
> ('net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn')
> 
> For -stable v5.1
> ('net/mlx5e: Fix port tunnel GRE entropy control')
> ('net/mlx5e: Rx, Fix checksum calculation for new hardware')
> ('net/mlx5e: Fix return value from timeout recover function')
> ('net/mlx5e: Fix error flow in tx reporter diagnose')
> 
> For -stable v5.2
> ('net/mlx5: E-Switch, Fix default encap mode')

Queued up.

> Conflict note: This pull request will produce a small conflict when
> merged with net-next.
> In drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
> Take the hunk from net and replace:
> esw_offloads_steering_init(esw, vf_nvports, total_nvports);
> with:
> esw_offloads_steering_init(esw);

Thank you.

Reply via email to