diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-01 14:11:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-01 14:11:48 -0700 |
| commit | ea23b42739a2c3c1158344928048fff8c70d1f66 (patch) | |
| tree | 59f936be93df55cb619f7f435f85cd815fb93de7 /drivers/misc/isl29003.c | |
| parent | 4d8a991d460d4fa4829beaffdcba45a217ca0fa7 (diff) | |
| parent | 8ff93de7668bd81bc8efa819d1184ebd48fae72d (diff) | |
| download | linux-ea23b42739a2c3c1158344928048fff8c70d1f66.tar.bz2 | |
Merge tag 'mlx5-fixes-2017-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
Mellanox, mlx5 fixes 2017-06-28
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/misc/isl29003.c')
0 files changed, 0 insertions, 0 deletions