tree 7780d3c47003479d281c14cd917d0bb4b23ff35b
parent 07007dbee468389b7124bc2efb7241a93067d901
parent 8e3e4b9da7e62680668f6cf71742207758764458
author David S. Miller <davem@davemloft.net> 1591925120 -0700
committer David S. Miller <davem@davemloft.net> 1591925120 -0700

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2020-06-11

This series contains fixes to the iavf driver.

Brett fixes the supported link speeds in the iavf driver, which was only
able to report speeds that the i40e driver supported and was missing the
speeds supported by the ice driver.  In addition, fix how 2.5 and 5.0
GbE speeds are reported.

Alek fixes a enum comparison that was comparing two different enums that
may have different values, so update the comparison to use matching
enums.

Paul increases the time to complete a reset to allow for 128 VFs to
complete a reset.
====================

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