From e9c1c83679891a02e3b95b954847a95621cbbc79 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 6 Feb 2022 11:51:17 -0500 Subject: kernel: bump 5.10 to 5.10.98 Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- .../860-v5.17-MIPS-ath79-drop-_machine_restart-again.patch | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'target/linux/generic/backport-5.10/860-v5.17-MIPS-ath79-drop-_machine_restart-again.patch') diff --git a/target/linux/generic/backport-5.10/860-v5.17-MIPS-ath79-drop-_machine_restart-again.patch b/target/linux/generic/backport-5.10/860-v5.17-MIPS-ath79-drop-_machine_restart-again.patch index 28c69e36fa..971562a8f7 100644 --- a/target/linux/generic/backport-5.10/860-v5.17-MIPS-ath79-drop-_machine_restart-again.patch +++ b/target/linux/generic/backport-5.10/860-v5.17-MIPS-ath79-drop-_machine_restart-again.patch @@ -21,8 +21,6 @@ Signed-off-by: Thomas Bogendoerfer arch/mips/ath79/setup.c | 10 ---------- 1 file changed, 10 deletions(-) -diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c -index 891f495c4c3c01..0ac435fe2dc9aa 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c @@ -34,15 +34,6 @@ @@ -41,7 +39,7 @@ index 891f495c4c3c01..0ac435fe2dc9aa 100644 static void ath79_halt(void) { while (1) -@@ -234,7 +225,6 @@ void __init plat_mem_setup(void) +@@ -233,7 +224,6 @@ void __init plat_mem_setup(void) detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX); @@ -49,6 +47,3 @@ index 891f495c4c3c01..0ac435fe2dc9aa 100644 _machine_halt = ath79_halt; pm_power_off = ath79_halt; } --- -cgit - -- cgit v1.2.3