diff options
author | David S. Miller <davem@davemloft.net> | 2014-03-14 22:18:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-14 22:18:48 -0400 |
commit | 21396689cc093f2ab7ae29c9937e94e51ae96732 (patch) | |
tree | 2f9d86d4dd18a0d246deea48be96d8c9ca2fda75 /arch/arm/mach-mmp | |
parent | 983f59617aabbbfadbc73b897b9a78e6ffd92841 (diff) | |
parent | 6494294f277fdef1409b844b3d6eb1439c3fad8c (diff) | |
download | op-kernel-dev-21396689cc093f2ab7ae29c9937e94e51ae96732.zip op-kernel-dev-21396689cc093f2ab7ae29c9937e94e51ae96732.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates
This series contains updates to igb, i40e and i40evf.
I provide a code comment fix which David Miller noticed in the last
series of patches I submitted.
Shannon provides a patch to cleanup the NAPI structs when deleting the
netdev.
Anjali provides several patches for i40e, first fixes a bug in the update
filter logic which was causing a kernel panic. Then provides a fix to
rename an error bit to correctly indicate the error. Adds a definition
for a new state variable to keep track of features automatically disabled
due to hardware resource limitations versus user enforced feature disabled.
Anjali provides a patch to add code to handle when there is a filter
programming error due to a full table, which also resolves a previous
compile warning about an unused "*pf" variable introduced in the last i40e
series patch submission.
Jesse provides three i40e patches to cleanup strings to make more
consistent and to align with other Intel drivers.
Akeem cleans up a misleading function header comment for i40e.
Mitch provides a fix for i40e/i40evf to use the correctly reported number
of MSI-X vectors in the PF an VF. Then provides a patch to use
dma_set_mask_and_coherent() which was introduced in v3.13 and simplifies
the DMA mapping code a bit.
v2:
- dropped the 2 ixgbe patches from Emil based on feedback from David Miller,
where the 2 fixes should be handled in the net core to fix all drivers
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-mmp')
0 files changed, 0 insertions, 0 deletions