From: David S. Miller <davem@davemloft.net>
Date: Thu, 11 Feb 2021 22:36:22 +0000 (-0800)
Subject: Merge branch 'bnxt_en-fixes'
X-Git-Tag: v5.12-rc1~200^2~10^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1f19639db8be0e692865758e134d0e8e82212b8;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'bnxt_en-fixes'

Michael Chan says:

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

Two unrelated fixes.  The first one fixes intermittent false TX timeouts
during ring reconfigurations.  The second one fixes a formatting
discrepancy between the stored and the running FW versions.

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

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

b1f19639db8be0e692865758e134d0e8e82212b8