David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
e1000	e1000: avoid null pointer dereference on invalid stat type	2017-10-26 07:42:57 -07:00
e1000e	ethernet/intel: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
fm10k	ethernet/intel: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
i40evf	Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue	2017-10-19 11:44:36 +01:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
igbvf	ethernet/intel: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
ixgb	ethernet/intel: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
ixgbe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
ixgbevf	ethernet/intel: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
e100.c	ethernet/intel: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01: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