David S. Miller 3948b57bd5 Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue ... Jeff Kirsher says: ==================== 1GbE Intel Wired LAN Driver Updates 2017-06-07 This series contains a fix for e1000e and igb. Colin Ian King fixes sparse warnings in igb by making functions static. Chris Wilson provides a fix for a previous commit which is causing an issue during suspend "e1000e_pm_suspend()", where we need to run e1000e_pm_thaw() if __e1000_shutdown() is unsuccessful. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-08 14:41:19 -04:00
..
e1000	e1000: Omit private ndo_get_stats function	2017-04-20 16:18:45 -07:00
e1000e	e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails	2017-06-07 20:45:58 -07:00
fm10k	net: propagate tc filter chain index down the ndo_setup_tc call	2017-06-08 09:55:53 -04:00
i40e	net: propagate tc filter chain index down the ndo_setup_tc call	2017-06-08 09:55:53 -04:00
i40evf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-06 22:20:08 -04:00
igb	igb: make a few local functions static	2017-06-07 19:05:42 -07:00
igbvf	igbvf: Use net_device_stats from struct net_device	2017-04-20 16:32:45 -07:00
ixgb	ixgb: Omit private ndo_get_stats function	2017-04-20 16:18:45 -07:00
ixgbe	net: propagate tc filter chain index down the ndo_setup_tc call	2017-06-08 09:55:53 -04:00
ixgbevf	ixgbevf: Resolve warnings for -Wimplicit-fallthrough	2017-05-31 04:46:44 -07:00
e100.c	net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void	2017-06-05 11:00:42 -04:00
Kconfig	i40evf: Add support for Adaptive Virtual Function	2017-06-01 14:30:02 -07:00
Makefile	fm10k: Add skeletal frame for Intel(R) FM10000 Ethernet Switch Host Interface Driver	2014-09-23 03:59:13 -07:00