From: Saeed Mahameed <sae...@mellanox.com>
Date: Fri, 30 Jun 2017 10:12:26 +0300
> This series contains some fixes for the mlx5 core and netdev driver.
>
> Please pull and let me know if there's any problem.
>
> For -stable:
> ("net/mlx5e: Fix TX carrier errors report in get stats ndo") Kernels >= v4.7
>
> ("net/mlx5: Cancel delayed recovery work when unloading the driver") Kernels
> >= v4.10
> * When applied to net-next this will introduce a contextual conflict, it
> should be easy to resolve, (a spin_lock was changed to spin_lock_irqsave in
> net-next),
> if you need any help with this please let me know.
>
> ("net/mlx5: Fix driver load error flow when firmware is stuck") Kernels >=
> v4.4*
> * This patch fixes: 6c780a0267b8 ("net/mlx5: Wait for FW readiness before
> initializing command interface")
> which was submitted two weeks ago and queued up for v4.4.
>
> Sorry about the mess, but other than the above, this series doesn't introduce
> any conflict with the current mlx5 IPSec offload series.
Pulled and queued up for -stable, thanks.
I should be able to resolve the merge conflicts, thanks for letting
me know about it.
