From: Jakub Kicinski Date: Mon, 7 Sep 2020 17:08:37 +0000 (-0700) Subject: Merge branch 'bnxt_en-Two-bug-fixes' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=72bbee2aea29342b39a7925108e6dad7bbfca8d0;p=linux.git 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 --- 72bbee2aea29342b39a7925108e6dad7bbfca8d0