Commit c6886957 authored by David S. Miller's avatar David S. Miller
Browse files

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



Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2020-07-30

This series contains updates to e100, e1000, e1000e, igb, igbvf, ixgbe,
ixgbevf, iavf, and driver documentation.

Vaibhav Gupta converts legacy .suspend() and .resume() to generic PM
callbacks for e100, igbvf, ixgbe, ixgbevf, and iavf.

Suraj Upadhyay replaces 1 byte memsets with assignments for e1000,
e1000e, igb, and ixgbe.

Alexander Klimov replaces http links with https.

Miaohe Lin replaces uses of memset to clear MAC addresses with
eth_zero_addr().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d9790bc2 8698fb64

Documentation/networking/device_drivers/ethernet/intel/e100.rst

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ Identifying Your Adapter 


For information on how to identify your adapter, and for the latest Intel

network drivers, refer to the Intel Support website:

http://www.intel.com/support

https://www.intel.com/support



Driver Configuration Parameters

===============================
@@ -179,7 +179,7 @@ filtering by 
Support

=======

For general information, go to the Intel support website at:

http://www.intel.com/support/

https://www.intel.com/support/



or the Intel Wired Networking project hosted by Sourceforge at:

http://sourceforge.net/projects/e1000

Documentation/networking/device_drivers/ethernet/intel/fm10k.rst

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Ethernet Multi-host Controller. 


For information on how to identify your adapter, and for the latest Intel

network drivers, refer to the Intel Support website:

http://www.intel.com/support

https://www.intel.com/support





Flow Control

Documentation/networking/device_drivers/ethernet/intel/iavf.rst

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ device. 


For information on how to identify your adapter, and for the latest NVM/FW

images and Intel network drivers, refer to the Intel Support website:

http://www.intel.com/support

https://www.intel.com/support





Additional Features and Configurations

Documentation/networking/device_drivers/ethernet/intel/igb.rst

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Identifying Your Adapter 
========================

For information on how to identify your adapter, and for the latest Intel

network drivers, refer to the Intel Support website:

http://www.intel.com/support

https://www.intel.com/support





Command Line Parameters

Documentation/networking/device_drivers/ethernet/intel/igbvf.rst

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ Identifying Your Adapter 
========================

For information on how to identify your adapter, and for the latest Intel

network drivers, refer to the Intel Support website:

http://www.intel.com/support

https://www.intel.com/support





Additional Features and Configurations