linux-stable/drivers/net/ethernet/stmicro/stmmac
Jakub Kicinski 79548b7984 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:

drivers/net/ethernet/mediatek/mtk_ppe.c
  3fbe4d8c0e ("net: ethernet: mtk_eth_soc: ppe: add support for flow accounting")
  924531326e ("net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-03-30 14:43:03 -07:00
..
altr_tse_pcs.c
altr_tse_pcs.h
chain_mode.c net: ethernet: stmicro: stmmac: move dma conf to dedicated struct 2022-07-25 19:38:57 -07:00
common.h net: stmmac: don't reject VLANs when IFF_PROMISC is set 2023-03-27 10:33:06 +01:00
descs.h
descs_com.h
dwmac-anarion.c
dwmac-dwc-qos-eth.c net: stmmac: dwc-qos: Make struct dwc_eth_dwmac_data::remove return void 2023-02-13 19:50:43 -08:00
dwmac-generic.c net: stmmac: generic: drop of_match_ptr for ID table 2023-03-15 08:02:45 +00:00
dwmac-imx.c net: stmmac: Fix for mismatched host/device DMA address width 2023-03-19 10:56:03 +00:00
dwmac-ingenic.c
dwmac-intel-plat.c
dwmac-intel.c net: stmmac: Fix for mismatched host/device DMA address width 2023-03-19 10:56:03 +00:00
dwmac-intel.h
dwmac-ipq806x.c
dwmac-loongson.c stmmac: dwmac-loongson: fix missing of_node_put() while module exiting 2022-11-10 11:03:00 +01:00
dwmac-lpc18xx.c
dwmac-mediatek.c net: stmmac: Fix for mismatched host/device DMA address width 2023-03-19 10:56:03 +00:00
dwmac-meson.c
dwmac-meson8b.c net: stmmac: dwmac-meson8b: fix meson8b_devm_clk_prepare_enable() 2022-11-07 17:52:24 -08:00
dwmac-oxnas.c
dwmac-qcom-ethqos.c net: stmmac: qcom: drop of_match_ptr for ID table 2023-03-15 08:02:44 +00:00
dwmac-rk.c net: stmmac: Make stmmac_dvr_remove() return void 2023-02-13 19:50:43 -08:00
dwmac-socfpga.c
dwmac-sti.c net: stmmac: Make stmmac_dvr_remove() return void 2023-02-13 19:50:43 -08:00
dwmac-stm32.c net: stmmac: Make stmmac_dvr_remove() return void 2023-02-13 19:50:43 -08:00
dwmac-sun8i.c
dwmac-sunxi.c
dwmac-tegra.c net: stmmac: tegra: Add MGBE support 2022-12-05 09:44:42 +00:00
dwmac-visconti.c
dwmac4.h net: stmmac: remove duplicate dma queue channel macros 2022-10-27 11:36:11 +02:00
dwmac4_core.c net: stmmac: don't reject VLANs when IFF_PROMISC is set 2023-03-27 10:33:06 +01:00
dwmac4_descs.c
dwmac4_descs.h
dwmac4_dma.c
dwmac4_dma.h
dwmac4_lib.c
dwmac5.c net: stmmac: fix order of dwmac5 FlexPPS parametrization sequence 2023-02-13 20:04:43 -08:00
dwmac5.h
dwmac100.h net: stmmac: Disable automatic FCS/Pad stripping 2022-09-08 10:12:20 +02:00
dwmac100_core.c net: stmmac: Disable automatic FCS/Pad stripping 2022-09-08 10:12:20 +02:00
dwmac100_dma.c
dwmac1000.h net: stmmac: Disable automatic FCS/Pad stripping 2022-09-08 10:12:20 +02:00
dwmac1000_core.c net: stmmac: Disable automatic FCS/Pad stripping 2022-09-08 10:12:20 +02:00
dwmac1000_dma.c
dwmac_dma.h
dwmac_lib.c net: stmmac: work around sporadic tx issue on link-up 2022-08-25 12:40:56 -07:00
dwxgmac2.h
dwxgmac2_core.c
dwxgmac2_descs.c
dwxgmac2_dma.c
dwxlgmac2.h
enh_desc.c
hwif.c
hwif.h net/sched: taprio: only pass gate mask per TXQ for igc, stmmac, tsnep, am65_cpsw 2023-02-06 10:06:44 +00:00
Kconfig net: stmmac: tegra: Add MGBE support 2022-12-05 09:44:42 +00:00
Makefile net: stmmac: tegra: Add MGBE support 2022-12-05 09:44:42 +00:00
mmc.h
mmc_core.c
norm_desc.c
ring_mode.c net: ethernet: stmicro: stmmac: move dma conf to dedicated struct 2022-07-25 19:38:57 -07:00
stmmac.h net: stmmac: Make stmmac_dvr_remove() return void 2023-02-13 19:50:43 -08:00
stmmac_ethtool.c net: stmmac: Fix queue statistics reading 2023-01-16 13:10:04 +00:00
stmmac_hwtstamp.c stmmac: fix potential division by 0 2022-12-12 15:09:14 -08:00
stmmac_main.c net: stmmac: Fix for mismatched host/device DMA address width 2023-03-19 10:56:03 +00:00
stmmac_mdio.c net: phy: Remove probe_capabilities 2023-01-19 16:23:19 +01:00
stmmac_pci.c
stmmac_pcs.h
stmmac_platform.c Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net 2023-02-17 11:06:39 +00:00
stmmac_platform.h
stmmac_ptp.c net: stmmac: add aux timestamps fifo clearance wait 2023-01-11 21:10:06 -08:00
stmmac_ptp.h stmmac: fix potential division by 0 2022-12-12 15:09:14 -08:00
stmmac_selftests.c net: stmmac: selftests: fix potential memleak in stmmac_test_arpoffload() 2022-12-09 10:49:39 +00:00
stmmac_tc.c net/sched: taprio: only pass gate mask per TXQ for igc, stmmac, tsnep, am65_cpsw 2023-02-06 10:06:44 +00:00
stmmac_xdp.c
stmmac_xdp.h