1
0
Fork 0
alistair23-linux/drivers/net/ethernet/stmicro/stmmac
Andrey Zhizhikin 5552df2bf5 This is the 5.4.85 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl/glK0ACgkQONu9yGCS
 aT5W7A/9Fosi7yNmr9UI/IjjcvDzy2ecA/8Je/WHx9Q5AGUvPhaO9hiciuic3vIQ
 hh8TgKl/8+ZHuiKGXi89G1S7VIeZrCqz55wBpWSgaPsZ9zJzHFh65aSIsoN+Rlmy
 FLHr7BKxchmNgvtVcoO8gpgV2NsxRmJ8+NKWXIRmVzBe5oyyLLOtVsN96htq8jrx
 IrqqtpjVSzlP2enEVPsC0Xw6piK5xaWriQS5W8S1y5awP6Dets+T8CWlBvuoaBCH
 KzISleJF/R5sP4U4+4j6OwEzzPUqxMnCsYrATUOcu/pGGqwRZCVtY4JhxccMCZw6
 Q5gsvbcVTrz3IFyhMI7KL28+YvAOeQ67zOim6ucztgNXDYCMbc+uTxCDRERPr5Pl
 oiCfW42X8Z3Alt8KugDhjh6XYmMVS3u5tOQEaNoPC1mv+WGMJy6Szsq+NgJfbeqC
 8Fszz/1MQtPBBk/wVOvtNybNy+0W4sBGaUq98TtrfnfZtsuM/FrJiCgXTB9pqGxH
 Bq6R8BUsGeFEWzDDe29BoFJBXGpZ8Ox0/LKmBM7z2jWBZldH6DC54LhWaQgsLAMO
 UPGVCtfKNQXnJ/0bO5RSgikD9iTQyFBs5nhreJcXMsTPxI/5wXEkw6MDrvYXLTHE
 C6H6TarzGwlUcicc+UYCVplSTy+4D1sGbH95Rz0cMJHRyojKl8E=
 =9HIQ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdQaENiSDAlGTDEbB7G51OISzHs0FAl/gyMIACgkQ7G51OISz
 Hs0J4g//Y3R4XyO45gq0EtLAQy5rwTb+qO58phDIwC+puIedDTJnLo9IaDB3kyTa
 98++yv4VoWcgLLCsCtgqDube2Csyvx2Dl0JgDMR7L998VXxnVuht3vhUkcd081XR
 EJoNfpBva8uIeqB6LiGg9+jGEc0s5vUCXH3Ijt3ync8vZxrz8PSBruP8AKSOjjbo
 zvRUsCJugYyOrbg2bTswBNTgAOMB+SbtQkOPzQ19/uVzHSGFAUKp41XTVTsbaX62
 9UQQLDfUACvCyGXze50QTC4lRJZNl0PuUhQdz6WSu4DDF1I4QRf5onf39fffPHtU
 XwiCoa0mDwOJLr2An1xITdjQzudWRrp7Bt7JbfjTmcfAa5JPXVnXP12fdJeSm0w2
 ZJoH5A3o2iEq1Q+Fk6FOIEhPLm4ktGHegxo7eZOuBzPGtWTvqqE/ngzyfw/NovGP
 579YtIbY6+2pw3FF4Havv/adRKPcrFZNbiqGgOWpeCB+i7BfJQ4tSNJigtQwLvrf
 yVWJ2e+I9B3z+/HqPKU8OtCWf3R3vT4CvN1bInRFodeSsXUxQraXwKPP/bxOI57C
 TrS5/1pKStntol1IKSCVgXIh66GRt11hPKQHEOcOjG4u0VUSBb9uHoyBo0BTuhXW
 5EOj2hzc/DXye5HmGEQlqnMzSHVg6qn+eKhZKkxCqQLMIjKeAM8=
 =xf26
 -----END PGP SIGNATURE-----

Merge tag 'v5.4.85' into 5.4-2.2.x-imx

This is the 5.4.85 stable release

Conflicts (correct auto-resolve):
- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:
Ustream commit 318d90218b ("net: stmmac: free tx skb buffer in
stmmac_resume()") overlapped NXP commit dd7c2b79a9 ("MLK-24217 net:
ethernet: stmmac: free tx skb buffer in stmmac_resume()"), causing
double-declaration of the function to be present in the code.
Replace the NXP commit with upstream one.

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
2020-12-21 16:06:12 +00:00
..
Kconfig
Makefile
altr_tse_pcs.c
altr_tse_pcs.h
chain_mode.c
common.h
descs.h
descs_com.h
dwmac-anarion.c
dwmac-dwc-qos-eth.c
dwmac-generic.c
dwmac-imx.c MLK-23785 net: stmmac: dwmac-imx: add runtime pm support 2020-04-14 16:13:12 +08:00
dwmac-ipq806x.c net: ethernet: stmmac: Disable hardware multicast filter 2020-08-21 13:05:25 +02:00
dwmac-lpc18xx.c
dwmac-mediatek.c
dwmac-meson.c
dwmac-meson8b.c net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux 2020-12-21 13:27:05 +01:00
dwmac-oxnas.c
dwmac-qcom-ethqos.c net: stmmac: fix num_por initialization 2020-05-20 08:20:09 +02:00
dwmac-rk.c net: stmmac: dwmac-rk: fix error path in rk_gmac_probe 2020-04-01 11:01:37 +02:00
dwmac-socfpga.c net: stmmac: fix enabling socfpga's ptp_ref_clock 2020-05-10 10:31:26 +02:00
dwmac-sti.c
dwmac-stm32.c
dwmac-sun8i.c This is the 5.4.24 stable release 2020-03-08 18:57:18 +08:00
dwmac-sunxi.c net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes 2020-04-21 09:04:50 +02:00
dwmac4.h
dwmac4_core.c
dwmac4_descs.c
dwmac4_descs.h
dwmac4_dma.c
dwmac4_dma.h
dwmac4_lib.c
dwmac5.c MLK-23254: net: stmmac: fix fpe always enable issue 2020-02-20 11:22:48 +08:00
dwmac5.h
dwmac100.h
dwmac100_core.c
dwmac100_dma.c
dwmac1000.h
dwmac1000_core.c net: stmmac: dwmac1000: provide multicast filter fallback 2020-08-21 13:05:25 +02:00
dwmac1000_dma.c
dwmac_dma.h
dwmac_lib.c
dwxgmac2.h
dwxgmac2_core.c
dwxgmac2_descs.c
dwxgmac2_dma.c
enh_desc.c
hwif.c
hwif.h
mmc.h
mmc_core.c
norm_desc.c
ring_mode.c
stmmac.h MLK-23405 net: stmmac: mdio bus reset is not necessary during resume back 2020-02-28 14:44:21 +08:00
stmmac_ethtool.c net: stmmac: removed enabling eee in EEE set callback 2020-10-14 10:33:03 +02:00
stmmac_hwtstamp.c net: stmmac: Fix sub-second increment 2020-05-10 10:31:26 +02:00
stmmac_main.c This is the 5.4.85 stable release 2020-12-21 16:06:12 +00:00
stmmac_mdio.c MLK-23409 net: stmmac: correctly handle mdio bus reset error path 2020-03-18 15:29:07 +08:00
stmmac_pci.c
stmmac_pcs.h
stmmac_platform.c Merge tag 'v5.4.47' into imx_5.4.y 2020-06-19 17:32:49 +08:00
stmmac_platform.h
stmmac_ptp.c
stmmac_ptp.h
stmmac_selftests.c
stmmac_tc.c This is the 5.4.24 stable release 2020-03-08 18:57:18 +08:00