]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mlx5-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 Jul 2016 18:38:17 +0000 (11:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Jul 2016 18:38:17 +0000 (11:38 -0700)
commit85439405edf536c14d0213d2c3c009b1a8f0e563
tree8f76ef829e4d3e424d531fde65ed37ee46d8eaab
parent8b4b14c3cf786a1896ec25281aef68f3de1aa672
parent08daf8114ccc8e4d6c57929cb1dd0920d8513364
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
06a7574828b5 ('net/mlx5e: Implement ndo_tx_timeout callback') was also backported to -stable.
====================

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