Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2014-08-15
This series contains fixes to i40e only.
Anjali provides two fixes for i40e, first adds a check for non-active
VF before sending admin queue messages to the VFS. This resolves a
potential kernel panic which would happen whenever we got a Tx hang and
there were VFS that were not up or enabled. The second fix adds
additional checks so that we do try to access a VF that is not up or
enabled which would dereference a null pointer.
Jesse fixes a i40e PTP bug where the hang detection routine was never
being run when PTP was enabled.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>