From 6b1cd3e3451ab1057dd3b27fd3f9834e1765d20c Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 28 Aug 2021 07:40:00 -0400 Subject: kernel: bump 5.10 to 5.10.61 Manually rebased: bcm27xx/patches-5.10/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch Removed upstreamed: mvebu/patches-5.10/101-cpufreq-armada-37xx-forbid-cpufreq-for-1.2-GHz-variant.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B No dmesg regressions, everything functional Signed-off-by: John Audia --- target/linux/mediatek/patches-5.10/330-mtk-bmt-support.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/mediatek/patches-5.10/330-mtk-bmt-support.patch') diff --git a/target/linux/mediatek/patches-5.10/330-mtk-bmt-support.patch b/target/linux/mediatek/patches-5.10/330-mtk-bmt-support.patch index 363d0b857e..72a729c7f3 100644 --- a/target/linux/mediatek/patches-5.10/330-mtk-bmt-support.patch +++ b/target/linux/mediatek/patches-5.10/330-mtk-bmt-support.patch @@ -836,7 +836,7 @@ #include #include -@@ -608,6 +609,8 @@ static int mtk_snand_probe(struct platfo +@@ -612,6 +613,8 @@ static int mtk_snand_probe(struct platfo mtd->_block_isbad = mtk_snand_mtd_block_isbad; mtd->_block_markbad = mtk_snand_mtd_block_markbad; @@ -845,7 +845,7 @@ ret = mtd_device_register(mtd, NULL, 0); if (ret) { dev_err(msm->pdev.dev, "failed to register mtd partition\n"); -@@ -619,6 +622,7 @@ static int mtk_snand_probe(struct platfo +@@ -623,6 +626,7 @@ static int mtk_snand_probe(struct platfo return 0; errout4: @@ -853,7 +853,7 @@ devm_kfree(msm->pdev.dev, msm->page_cache); errout3: -@@ -646,6 +650,8 @@ static int mtk_snand_remove(struct platf +@@ -650,6 +654,8 @@ static int mtk_snand_remove(struct platf if (ret) return ret; -- cgit v1.2.3