tree c810b8c8ebbc8dd5c755f77ea179cd1e2c941fab
parent 8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a
parent e9e53662d8130dd950885e37dc1d97008e1283f9
author David S. Miller <davem@davemloft.net> 1445565728 -0700
committer David S. Miller <davem@davemloft.net> 1445565728 -0700

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-10-22

This series contains fixes to i40e only.

Jesse provides two small fixes for i40e, first fixes counters that were
being displayed incorrectly due to indexing beyond the array of strings
when printing stats.  Then fixed the fact that the driver was printing
a message about not being able to assign VMDq because a lack of MSI-X
vectors, when it was not true.  It was due to a line missing that
initialized a variable.
====================

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