David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
altr_tse_pcs.c
altr_tse_pcs.h
chain_mode.c
common.h	net: stmmac: Add support for VLAN promiscuous mode	2020-04-22 19:35:48 -07:00
descs_com.h
descs.h	net: stmmac: Initial support for TBS	2020-01-13 18:31:48 -08:00
dwmac4_core.c	net: stmmac: Add support for VLAN promiscuous mode	2020-04-22 19:35:48 -07:00
dwmac4_descs.c	net: stmmac: gmac4+: Add TBS support	2020-01-13 18:31:48 -08:00
dwmac4_descs.h	net: stmmac: gmac4+: Add TBS support	2020-01-13 18:31:48 -08:00
dwmac4_dma.c	net: stmmac: gmac4+: Add TBS support	2020-01-13 18:31:48 -08:00
dwmac4_dma.h	net: stmmac: gmac4+: Add TBS support	2020-01-13 18:31:48 -08:00
dwmac4_lib.c	net: stmmac: use readl_poll_timeout() function in dwmac4_dma_reset()	2020-03-16 02:10:09 -07:00
dwmac4.h	net: stmmac: Add support for VLAN promiscuous mode	2020-04-22 19:35:48 -07:00
dwmac5.c	net: stmmac: gmac5+: fix potential integer overflow on 32 bit multiply	2020-05-04 11:57:21 -07:00
dwmac5.h	net: stmmac: gmac5+: Add support for Frame Preemption	2019-12-18 12:17:11 -08:00
dwmac100_core.c
dwmac100_dma.c
dwmac100.h
dwmac1000_core.c	net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting	2020-04-03 15:58:54 -07:00
dwmac1000_dma.c
dwmac1000.h
dwmac_dma.h	net: stmmac: Let TX and RX interrupts be independently enabled/disabled	2019-12-18 12:14:08 -08:00
dwmac_lib.c	net: stmmac: dwmac_lib: remove unnecessary checks in dwmac_dma_reset()	2020-03-19 21:05:27 -07:00
dwmac-anarion.c
dwmac-dwc-qos-eth.c	net: stmmac: dwc-qos: avoid clk and reset for acpi device	2019-12-17 13:55:23 -08:00
dwmac-generic.c
dwmac-imx.c	net: ethernet: dwmac: add ethernet glue logic for NXP imx8 chip	2020-05-29 17:01:26 -07:00
dwmac-intel.c	stmmac: intel: Fix indentation to put on one line affected code	2020-04-30 12:50:15 -07:00
dwmac-intel.h	net: stmmac: Enable SERDES power up/down sequence	2020-04-21 15:54:45 -07:00
dwmac-ipq806x.c	net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x	2020-05-22 16:07:02 -07:00
dwmac-lpc18xx.c
dwmac-mediatek.c	net-next: stmmac: mediatek: add more support for RMII	2019-12-17 13:48:30 -08:00
dwmac-meson8b.c	net: stmmac: dwmac-meson8b: add support for the RX delay configuration	2020-05-13 12:23:14 -07:00
dwmac-meson.c
dwmac-oxnas.c
dwmac-qcom-ethqos.c	net: stmmac: fix num_por initialization	2020-05-14 12:48:15 -07:00
dwmac-rk.c	net: stmmac: dwmac-rk: fix error path in rk_gmac_probe	2020-03-21 19:58:48 -07:00
dwmac-socfpga.c	net: stmmac: fix enabling socfpga's ptp_ref_clock	2020-04-18 15:02:18 -07:00
dwmac-sti.c
dwmac-stm32.c	net: ethernet: stmmac: simplify phy modes management for stm32	2020-05-01 15:17:32 -07:00
dwmac-sun8i.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-01-09 12:13:43 -08:00
dwmac-sunxi.c	net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes	2020-04-16 13:47:53 -07:00
dwxgmac2_core.c	net: stmmac: xgmac: Fix VLAN register handling	2020-04-02 07:04:45 -07:00
dwxgmac2_descs.c	net: stmmac: xgmac: Add TBS support	2020-01-13 18:31:48 -08:00
dwxgmac2_dma.c	net: stmmac: xgmac: Add TBS support	2020-01-13 18:31:48 -08:00
dwxgmac2.h	net: stmmac: xgmac: Add TBS support	2020-01-13 18:31:48 -08:00
dwxlgmac2.h	net: stmmac: Add support for Enterprise MAC version	2020-03-17 21:37:25 -07:00
enh_desc.c
hwif.c	net: stmmac: Add support for Enterprise MAC version	2020-03-17 21:37:25 -07:00
hwif.h	net: stmmac: Add support for VLAN Rx filtering	2020-03-30 10:36:44 -07:00
Kconfig	net: ethernet: dwmac: add ethernet glue logic for NXP imx8 chip	2020-05-29 17:01:26 -07:00
Makefile	net: ethernet: dwmac: add ethernet glue logic for NXP imx8 chip	2020-05-29 17:01:26 -07:00
mmc_core.c	net: stmmac: mmc: Add Frame Preemption counters on GMAC5+ cores	2019-12-18 12:17:11 -08:00
mmc.h
norm_desc.c
ring_mode.c
stmmac_ethtool.c	stmmac: let core reject the unsupported coalescing parameters	2020-03-05 12:12:34 -08:00
stmmac_hwtstamp.c	net: stmmac: Fix sub-second increment	2020-04-18 15:02:18 -07:00
stmmac_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
stmmac_mdio.c	net: stmmac: Integrate it with DesignWare XPCS	2020-03-09 20:13:16 -07:00
stmmac_pci.c	stmmac: intel: Fix clock handling on error and remove paths	2020-04-30 12:50:15 -07:00
stmmac_pcs.h
stmmac_platform.c	stmmac: platform: add "snps, dwmac-5.10a" IP compatible string	2020-05-29 17:01:26 -07:00
stmmac_platform.h
stmmac_ptp.c
stmmac_ptp.h
stmmac_selftests.c	net: sched: rename more stats_types	2020-03-23 20:54:23 -07:00
stmmac_tc.c	net: rename flow_action_hw_stats_types* -> flow_action_hw_stats*	2020-03-17 21:12:39 -07:00
stmmac.h	net: stmmac: Initial support for TBS	2020-01-13 18:31:48 -08:00