diff options
| author | David S. Miller | 2015-12-05 23:39:31 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-12-05 23:39:31 +0100 |
| commit | f61e2eebc7c572723cef1742bc7e99ac6cffe192 (patch) | |
| tree | 3c0b9258068d08ea0ec63c20be17cbbd3cfa7cd0 /Documentation | |
| parent | atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation (diff) | |
| parent | i40e/i40evf: avoid mutex re-init (diff) | |
| download | kernel-qcow2-linux-f61e2eebc7c572723cef1742bc7e99ac6cffe192.tar.gz kernel-qcow2-linux-f61e2eebc7c572723cef1742bc7e99ac6cffe192.tar.xz kernel-qcow2-linux-f61e2eebc7c572723cef1742bc7e99ac6cffe192.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2015-12-03
This series contains updates to ixgbe, i40e/i40evf, MAINTAINERS and e100.txt
Alex provides a fix for ixgbe where enabling SR-IOV and then bringing the
interface up was resulting in the PF MAC addresses getting into a bad state.
The workaround for this issue is to bring up the interface first and then
enable SR-IOV as this will trigger the reset in the existing code.
I clean up legacy license stuff in the e100.txt documentation and then
update the maintainers/reviewers list for our drivers.
Jesse fixes an issue with the i40e/i40evf drivers, where if the driver were
to happen to have a mutex held while the i40e_init_adminq() call was called,
the init_adminq might inadvertently call mutex_init on a lock that was held
which is a violation of the calling semantices.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/e100.txt | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Documentation/networking/e100.txt b/Documentation/networking/e100.txt index f862cf3aff34..42ddbd4b52a9 100644 --- a/Documentation/networking/e100.txt +++ b/Documentation/networking/e100.txt @@ -181,17 +181,3 @@ For general information, go to the Intel support website at: 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 to e1000-devel@lists.sourceforge.net. - - -License -======= - -This software program is released under the terms of a license agreement -between you ('Licensee') and Intel. Do not use or load this software or any -associated materials (collectively, the 'Software') until you have carefully -read the full terms and conditions of the file COPYING located in this software -package. By loading or using the Software, you agree to the terms of this -Agreement. If you do not agree with the terms of this Agreement, do not install -or use the Software. - -* Other names and brands may be claimed as the property of others. |