OSDN Git Service

Merge branch 'bnxt_en-Two-bug-fixes'
authorJakub Kicinski <kuba@kernel.org>
Mon, 7 Sep 2020 17:08:37 +0000 (10:08 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 7 Sep 2020 17:08:52 +0000 (10:08 -0700)
commit72bbee2aea29342b39a7925108e6dad7bbfca8d0
tree959d2016bd5ee4367234c2549cac2eecf5d586d5
parent4ddcaf1ebb5e4e99240f29d531ee69d4244fe416
parentb16939b59cc00231a75d224fd058d22c9d064976
Merge branch 'bnxt_en-Two-bug-fixes'

Michael Chan says:

====================
bnxt_en: Two bug fixes.

The first patch fixes AER recovery by reducing the time from several
minutes to a more reasonable 20 - 30 seconds.  The second patch fixes
a possible NULL pointer crash during firmware reset.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>