tree 8f76ef829e4d3e424d531fde65ed37ee46d8eaab
parent ea43f860d984b00c3e3fa02049412ce94ce9ed5e
parent c3b7c5c9504348e0c22fa47629c419d82c963bc2
author David S. Miller <davem@davemloft.net> 1468435097 -0700
committer David S. Miller <davem@davemloft.net> 1468435097 -0700

Merge branch 'mlx5-fixes'

Saeed Mahameed says:

====================
mlx5 tx timeout watchdog fixes

This patch set provides two trivial fixes for the tx timeout series lately
applied into net 4.7.

From Daniel, detect stuck queues due to BQL
From Mohamad, fix tx timeout watchdog false alarm

Hopefully those two fixes will make it to -stable, assuming
3947ca185999 ('net/mlx5e: Implement ndo_tx_timeout callback') was also backported to -stable.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>