aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost/tcm_vhost.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-04-26 23:33:41 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-26 23:33:41 -0400
commitc39904a0ac22cf05f5f44226457f6da0fe65457e (patch)
treeeda7488e1093465d1017de782956a95e65d195ae /drivers/vhost/tcm_vhost.h
parentb38a54eaa0acc5991cbad93bf44b355aa43f6d6f (diff)
parentc4a56de88c6cd9996fb5dc7576d6c4934b5e6465 (diff)
downloadkernel_goldelico_gta04-c39904a0ac22cf05f5f44226457f6da0fe65457e.zip
kernel_goldelico_gta04-c39904a0ac22cf05f5f44226457f6da0fe65457e.tar.gz
kernel_goldelico_gta04-c39904a0ac22cf05f5f44226457f6da0fe65457e.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== This series contains updates to e1000e, igb and ixgbe. There are 2 patches in this series which could be applied to net, but since Linus is so very close to releasing 3.9, I do not think it prudent to try and push these into net at this time. I have CC'd stable on these patches so that they can queue them up as soon as 3.9 gets released. The 2 patches are: e1000e: fix numeric overflow in phc settime method ixgbe: fix EICR write in ixgbe_msix_other Richard provides a fix for e1000e by using a helper function from time.h to resolve a unintended overflow in the PTP settime function. Bruce provides a fix to wait for NAPI to be done with the current context after disabling interrupts and then disable NAPI when the interface is going down. This fixes a possible "unable to handle kernel paging request" panic in net-next. Andi Kleen provides a patch for igb to use mdelay instead of udelay when we needed 100000us. Jacob provides a fix for ixgbe to simply mask the lower 16bits off so that ixgbe_msix_other does not write them in the EICR, which causes them to remain high and be properly handled by the clean_rings interrupt routine as normal. Emil cleans up the logic in ixgbe_setup_loopback_test() to only access registers applicable to the MAC type. In addition, removes majority of the AUTOC register reads by using a cached value instead to avoid writing corrupted values to AUTOC due to bad FW. Emil also add support for disabling link during boot time. Lastly, he provides a patch which adds the MAC type to the version in ethtool_regs which will make it easier to check the MAC type when dumping registers with ethtool. There is a separate ethtool tool patch which is dependent upon Emil's last patch of the series to add the MAC type to the version in ethtool_regs, which will be sent separately. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost/tcm_vhost.h')
0 files changed, 0 insertions, 0 deletions