mirror_ubuntu-kernels/drivers/net/ethernet/stmicro/stmmac
David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 11:53:36 -08:00
..
altr_tse_pcs.c
altr_tse_pcs.h
chain_mode.c net: stmmac: Switch stmmac_mode_ops to generic HW Interface Helpers 2018-04-16 18:50:03 -04:00
common.h net: stmmac: Fix RX packet size > 8191 2018-11-08 19:47:44 -08:00
descs_com.h net: stmmac: Fix RX packet size > 8191 2018-11-08 19:47:44 -08:00
descs.h
dwmac4_core.c net: stmmac: Add Flexible PPS support 2018-06-04 10:13:16 -04:00
dwmac4_descs.c net: stmmac: Let descriptor code get skbuff address 2018-05-18 11:00:16 -04:00
dwmac4_descs.h
dwmac4_dma.c Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2018-07-03 10:29:26 +09:00
dwmac4_dma.h net: stmmac: Set DMA buffer size in HW 2018-06-28 22:24:25 +09:00
dwmac4_lib.c
dwmac4.h net: stmmac: Add Flexible PPS support 2018-06-04 10:13:16 -04:00
dwmac5.c net: stmmac: Add Flexible PPS support 2018-06-04 10:13:16 -04:00
dwmac5.h net: stmmac: Add Flexible PPS support 2018-06-04 10:13:16 -04:00
dwmac100_core.c net: stmmac: Implement logic to automatically select HW Interface 2018-04-23 12:03:50 -04:00
dwmac100_dma.c net: stmmac: Uniformize the use of dma_init_* callbacks 2018-05-18 11:00:15 -04:00
dwmac100.h
dwmac1000_core.c net: stmmac: Implement logic to automatically select HW Interface 2018-04-23 12:03:50 -04:00
dwmac1000_dma.c net: stmmac: Uniformize the use of dma_init_* callbacks 2018-05-18 11:00:15 -04:00
dwmac1000.h net: stmmac: Implement logic to automatically select HW Interface 2018-04-23 12:03:50 -04:00
dwmac_dma.h
dwmac_lib.c
dwmac-anarion.c
dwmac-dwc-qos-eth.c
dwmac-generic.c net: stmmac: Add the bindings parsing for XGMAC2 2018-08-09 11:16:28 -07:00
dwmac-ipq806x.c
dwmac-lpc18xx.c
dwmac-mediatek.c net-next: stmmac: dwmac-mediatek: remove fine-tune property 2018-12-19 16:24:58 -08:00
dwmac-meson8b.c net: stmmac: dwmac-meson8b: Fix an error handling path in 'meson8b_dwmac_probe()' 2018-06-12 15:36:14 -07:00
dwmac-meson.c
dwmac-oxnas.c
dwmac-rk.c net: ethernet: stmmac: dwmac-rk: Add GMAC support for px30 2018-06-29 22:19:05 +09:00
dwmac-socfpga.c net: stmmac: socfpga: add additional ocp reset line for Stratix10 2018-06-20 14:34:26 +09:00
dwmac-sti.c
dwmac-stm32.c net: ethernet: stmmac: add adaptation for stm32mp157c. 2018-05-28 23:08:29 -04:00
dwmac-sun8i.c net: stmmac: dwmac-sun8i: fix OF child-node lookup 2018-10-23 13:28:52 -05:00
dwmac-sunxi.c
dwxgmac2_core.c net: stmmac: Add CBS support in XGMAC2 2018-09-01 17:40:22 -07:00
dwxgmac2_descs.c net: stmmac: Add descriptor related callbacks for XGMAC2 2018-08-09 11:16:28 -07:00
dwxgmac2_dma.c net: stmmac: Add CBS support in XGMAC2 2018-09-01 17:40:22 -07:00
dwxgmac2.h net: stmmac: Add CBS support in XGMAC2 2018-09-01 17:40:22 -07:00
enh_desc.c net: stmmac: Fix RX packet size > 8191 2018-11-08 19:47:44 -08:00
hwif.c net: stmmac: Enable TC Ops for GMAC >= 4 2018-09-08 10:24:30 -07:00
hwif.h net: stmmac: Add descriptor related callbacks for XGMAC2 2018-08-09 11:16:28 -07:00
Kconfig stmmac: dwmac-mediatek: add support for mt2712 2018-12-12 15:21:00 -08:00
Makefile stmmac: dwmac-mediatek: add support for mt2712 2018-12-12 15:21:00 -08:00
mmc_core.c
mmc.h
norm_desc.c net: stmmac: Let descriptor code get skbuff address 2018-05-18 11:00:16 -04:00
ring_mode.c net: stmmac: Fix RX packet size > 8191 2018-11-08 19:47:44 -08:00
stmmac_ethtool.c net: ethernet: Convert phydev advertize and supported from u32 to link mode 2018-11-11 10:10:01 -08:00
stmmac_hwtstamp.c net: stmmac: Switch stmmac_hwtimestamp to generic HW Interface Helpers 2018-04-16 18:49:55 -04:00
stmmac_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-12-20 11:53:36 -08:00
stmmac_mdio.c net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules 2018-10-31 18:35:58 -07:00
stmmac_pci.c net: stmmac: mark PM functions as __maybe_unused 2018-08-13 20:45:49 -07:00
stmmac_pcs.h
stmmac_platform.c stmmac: fix valid numbers of unicast filter entries 2018-09-16 15:23:48 -07:00
stmmac_platform.h
stmmac_ptp.c net: stmmac: Add PTP support for XGMAC2 2018-08-09 11:16:28 -07:00
stmmac_ptp.h net: stmmac: Add PTP support for XGMAC2 2018-08-09 11:16:28 -07:00
stmmac_tc.c net_sched: remove list_head from tc_action 2018-08-21 12:45:44 -07:00
stmmac.h net: stmmac: Rework coalesce timer and fix multi-queue races 2018-09-18 19:48:08 -07:00