Commit d74aab2c authored by Jakub Kicinski's avatar Jakub Kicinski

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-03-30 (documentation, ice)

This series contains updates to driver documentation and the ice driver.

Tony removes links and addresses related to the out-of-tree driver from the
Intel ethernet driver documentation.

Jake removes a comment that is no longer valid to the ice driver.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ice: remove comment about not supporting driver reinit
  Documentation/eth/intel: Remove references to SourceForge
  Documentation/eth/intel: Update address for driver support
====================

Link: https://lore.kernel.org/r/20230330165935.2503604-1-anthony.l.nguyen@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 54fd494a 503d473c
...@@ -180,8 +180,6 @@ Support ...@@ -180,8 +180,6 @@ Support
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
http://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
...@@ -451,13 +451,8 @@ Support ...@@ -451,13 +451,8 @@ Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
http://support.intel.com
http://support.intel.com
or the Intel Wired Networking project hosted by Sourceforge at:
http://sourceforge.net/projects/e1000
If an issue is identified with the released source code on the supported If an issue is identified with the released source code on the supported
kernel with a supported adapter, email the specific information related kernel with a supported adapter, email the specific information related
to the issue to e1000-devel@lists.sf.net to the issue to intel-wired-lan@lists.osuosl.org.
...@@ -371,13 +371,8 @@ NOTE: Wake on LAN is only supported on port A for the following devices: ...@@ -371,13 +371,8 @@ NOTE: Wake on LAN is only supported on port A for the following devices:
Support Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
...@@ -130,13 +130,8 @@ the Intel Ethernet Controller XL710. ...@@ -130,13 +130,8 @@ the Intel Ethernet Controller XL710.
Support Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
...@@ -759,13 +759,8 @@ enabled when setting up DCB on your switch. ...@@ -759,13 +759,8 @@ enabled when setting up DCB on your switch.
Support Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
...@@ -319,13 +319,8 @@ This is caused by the way the Linux kernel reports this stressed condition. ...@@ -319,13 +319,8 @@ This is caused by the way the Linux kernel reports this stressed condition.
Support Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://support.intel.com https://support.intel.com
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on the supported kernel If an issue is identified with the released source code on the supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net to intel-wired-lan@lists.osuosl.org.
...@@ -1026,12 +1026,9 @@ Support ...@@ -1026,12 +1026,9 @@ Support
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
Trademarks Trademarks
......
...@@ -201,13 +201,8 @@ NOTE: This feature is exclusive to i210 models. ...@@ -201,13 +201,8 @@ NOTE: This feature is exclusive to i210 models.
Support Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
...@@ -53,13 +53,8 @@ https://www.kernel.org/pub/software/network/ethtool/ ...@@ -53,13 +53,8 @@ https://www.kernel.org/pub/software/network/ethtool/
Support Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
...@@ -545,13 +545,8 @@ on the Intel Ethernet Controller XL710. ...@@ -545,13 +545,8 @@ on the Intel Ethernet Controller XL710.
Support Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
...@@ -55,13 +55,8 @@ VLANs: There is a limit of a total of 64 shared VLANs to 1 or more VFs. ...@@ -55,13 +55,8 @@ VLANs: There is a limit of a total of 64 shared VLANs to 1 or more VFs.
Support Support
======= =======
For general information, go to the Intel support website at: For general information, go to the Intel support website at:
https://www.intel.com/support/ https://www.intel.com/support/
or the Intel Wired Networking project hosted by Sourceforge at:
https://sourceforge.net/projects/e1000
If an issue is identified with the released source code on a supported kernel If an issue is identified with the released source code on a supported kernel
with a supported adapter, email the specific information related to the issue with a supported adapter, email the specific information related to the issue
to e1000-devel@lists.sf.net. to intel-wired-lan@lists.osuosl.org.
...@@ -1254,7 +1254,6 @@ static const struct devlink_ops ice_devlink_ops = { ...@@ -1254,7 +1254,6 @@ static const struct devlink_ops ice_devlink_ops = {
.supported_flash_update_params = DEVLINK_SUPPORT_FLASH_UPDATE_OVERWRITE_MASK, .supported_flash_update_params = DEVLINK_SUPPORT_FLASH_UPDATE_OVERWRITE_MASK,
.reload_actions = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) | .reload_actions = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) |
BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE), BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE),
/* The ice driver currently does not support driver reinit */
.reload_down = ice_devlink_reload_down, .reload_down = ice_devlink_reload_down,
.reload_up = ice_devlink_reload_up, .reload_up = ice_devlink_reload_up,
.port_split = ice_devlink_port_split, .port_split = ice_devlink_port_split,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment