From: David S. Miller <davem@davemloft.net>
Date: Mon, 2 Mar 2020 03:15:27 +0000 (-0800)
Subject: Merge branch 'bnxt_en-2-bug-fixes'
X-Git-Tag: v5.6-rc6~23^2~61
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ab124d580ad40b0666d7892ceccd8c4ac1ce4c79;p=users%2Fdwmw2%2Flinux.git

Merge branch 'bnxt_en-2-bug-fixes'

Michael Chan says:

====================
bnxt_en: 2 bug fixes.

This first patch fixes a rare but possible crash in pci_disable_msix()
when the MTU is changed.  The 2nd patch fixes a regression in error
code handling when flashing a file to NVRAM.

Please also queue these for -stable.  Thanks.
====================

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

ab124d580ad40b0666d7892ceccd8c4ac1ce4c79