tree 31cd38e14cc5b4b5262079f6d93ef0fc79ad91eb
parent 0ad6f6e767ec2f613418cbc7ebe5ec4c35af540c
parent 3995ecbabc6f8019b3a55aeb551eeb9598b8b354
author David S. Miller <davem@davemloft.net> 1592596512 -0700
committer David S. Miller <davem@davemloft.net> 1592596512 -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-18

This series contains fixes to ixgbe, i40e and ice driver.

Ciara fixes up the ixgbe, i40e and ice drivers to protect access when
allocating and freeing the rings.  In addition, made use of READ_ONCE
when reading the rings prior to accessing the statistics pointer.

Björn fixes a crash where the receive descriptor ring allocation was
moved to a different function, which broke the ethtool set_ringparam()
hook.
====================

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