David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
e1000	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
e1000e	e1000e: Fix -Wformat-truncation warnings	2019-02-23 13:44:57 -08:00
fm10k	fm10k: use struct_size() in kzalloc()	2019-02-08 22:57:28 -08:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-24 12:06:19 -08:00
iavf	flow_offload: add flow_rule and flow_match structures and use them	2019-02-06 10:38:25 -08:00
ice	net: Add extack argument to ndo_fdb_add()	2019-01-17 15:18:47 -08:00
igb	igb: use struct_size() helper	2019-02-08 23:03:48 -08:00
igbvf	ethernet/intel: consolidate NAPI and NAPI exit	2018-11-21 10:35:23 -08:00
igc	igc: Use struct_size() helper	2019-02-08 23:03:48 -08:00
ixgb	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
ixgbe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-24 12:06:19 -08:00
ixgbevf	xfrm: prefer secpath_set over secpath_dup	2018-12-19 11:21:38 -08:00
e100.c	e100: Fix passing zero to 'PTR_ERR' warning in e100_load_ucode_wait	2018-12-20 11:54:27 -08:00
Kconfig	ixgbe: fix Kconfig when driver is not a module	2019-01-04 14:02:16 -08:00
Makefile	igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support	2018-10-17 12:14:54 -07:00