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_82575.c	igb: support BCM54616 PHY	2017-08-08 18:09:12 -07:00
e1000_82575.h	igb: support RX flow classification by ethertype	2016-08-18 22:27:48 -07:00
e1000_defines.h	igb: Add support for CBS offload	2017-10-27 09:49:36 -07:00
e1000_hw.h	igb: support BCM54616 PHY	2017-08-08 18:09:12 -07:00
e1000_i210.c	igb: Fix hw_dbg logging in igb_update_flash_i210	2017-01-06 02:23:22 -08:00
e1000_i210.h	igb: Remove GS40G specific defines/functions	2015-12-14 10:20:06 -08:00
e1000_mac.c	igb: Realign bad indentation	2017-01-06 02:18:49 -08:00
e1000_mac.h	igb: Merge VLVF configuration into igb_vfta_set	2016-02-15 16:36:52 -08:00
e1000_mbx.c	igb: do not drop PF mailbox lock after read of VF message	2017-08-08 17:52:45 -07:00
e1000_mbx.h	igb: do not drop PF mailbox lock after read of VF message	2017-08-08 17:52:45 -07:00
e1000_nvm.c	igb: use BIT() macro or unsigned prefix	2016-05-13 14:39:47 -07:00
e1000_nvm.h
e1000_phy.c	scripts/spelling.txt: add regsiter -> register spelling mistake	2017-05-08 17:15:13 -07:00
e1000_phy.h	igb: use BIT() macro or unsigned prefix	2016-05-13 14:39:47 -07:00
e1000_regs.h	igb: Add support for CBS offload	2017-10-27 09:49:36 -07:00
igb_ethtool.c	igb: Remove useless argument	2017-06-06 01:04:13 -07:00
igb_hwmon.c
igb_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
igb_ptp.c	igb: check for Tx timestamp timeouts during watchdog	2017-06-06 01:03:17 -07:00
igb.h	igb: Add support for CBS offload	2017-10-27 09:49:36 -07:00
Makefile