From: David S. Miller Date: Sun, 17 Aug 2014 02:24:55 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net X-Git-Tag: v4.9.8~5834^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b7911c1fccb063155a3d4705d39637e676e25be;p=platform%2Fkernel%2Flinux-rpi3.git Merge branch 'master' of git://git./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 --- 5b7911c1fccb063155a3d4705d39637e676e25be