From: David S. Miller <davem@davemloft.net>
Date: Mon, 15 Jun 2020 20:28:33 +0000 (-0700)
Subject: Merge branch 'bnxt_en-Bug-fixes'
X-Git-Tag: v5.8-rc2~26^2~15
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7c6cdf6376d563ddaf9229cf39c4f372516eb3ad;p=users%2Fhch%2Fblock.git

Merge branch 'bnxt_en-Bug-fixes'

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>
---

7c6cdf6376d563ddaf9229cf39c4f372516eb3ad