From 273ded68b827dca8018a47c8f0826ed455847f30 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Fri, 2 Apr 2021 11:46:03 +0200 Subject: kernel: bump 4.14 to 4.14.228 Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch | 2 +- .../patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/sunxi/patches-4.14') diff --git a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch index 9f7f89c7e2..90266eeed3 100644 --- a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch +++ b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch @@ -468,7 +468,7 @@ Signed-off-by: David S. Miller /* platform data specifying hardware features and callbacks. * hardware features were copied from Allwinner drivers. -@@ -979,9 +1047,34 @@ static int sun8i_dwmac_probe(struct plat +@@ -981,9 +1049,34 @@ static int sun8i_dwmac_probe(struct plat ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) diff --git a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch index 0e8d808b42..c496e06f69 100644 --- a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch +++ b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -@@ -1078,6 +1078,14 @@ return ret; +@@ -1080,6 +1080,14 @@ return ret; } static const struct of_device_id sun8i_dwmac_match[] = { -- cgit v1.2.3