]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge branch 'bnxt_en-Bug-fixes'
authorDavid S. Miller <davem@davemloft.net>
Mon, 15 Jun 2020 20:28:33 +0000 (13:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Jun 2020 20:28:33 +0000 (13:28 -0700)
Michael Chan says:

====================
bnxt_en: Bug fixes.

Four fixes related to the bnxt_en driver's resume path, AER reset, and
the timer function.
====================

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

Trivial merge