From: David S. Miller <davem@davemloft.net>
Date: Sat, 6 Jun 2015 04:15:50 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c6271b7633f066eb1cd46c17862bde6c97f6a5ba;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-06-04

This series contains updates to i40e and i40evf.

Anjali provides three fixes, first to resolve a Tx queue hang if mixed
size frags are passed to the driver while using TSO.  There was a corner
case where we needed to linearize but we were not.  Next fixes a bug in
the default configuration which prevented a software bridge loaded on the
PF interface from working correctly because broadcast packets are
incorrectly looped back.  Lastly fixes an NPAR bug when SRIOV is enabled,
where we need to be in VEB mode, not VEPA mode at probe.
====================

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

c6271b7633f066eb1cd46c17862bde6c97f6a5ba