From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Sat, 14 Dec 2019 21:01:17 +0000 (-0800)
Subject: Merge branch 'bnx2x-bug-fixes'
X-Git-Tag: v5.5-rc3~7^2~44
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7ae1629d4db0d68d6c332bcb4f0457b4fc7ab4aa;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'bnx2x-bug-fixes'

Manish Chopra says:

====================
bnx2x: bug fixes

This series has two driver changes, one to fix some unexpected
hardware behaviour casued during the parity error recovery in
presence of SR-IOV VFs and another one related for fixing resource
management in the driver among the PFs configured on an engine.

Please consider applying it to "net".

V1->V2:
=======
Fix the compilation errors reported by kbuild test robot
on the patch #1 with CONFIG_BNX2X_SRIOV=n
====================

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---

7ae1629d4db0d68d6c332bcb4f0457b4fc7ab4aa