From b81045a81848ad2f51577d61c2379f27d50d71d9 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Wed, 31 May 2023 21:02:52 +0200 Subject: kernel: bump 6.1 to 6.1.31 All patches automatically rebased. Build system: x86_64/Fedora 38 Build-tested: ipq807x/Qnap 301W, ipq807x/Dynalink DL-WRX36 Run-tested: ipq807x/Qnap 301W, ipq807x/Dynalink DL-WRX36 Signed-off-by: Robert Marko --- ...00-irqchip-add-support-for-bcm6345-style-external-inter.patch | 2 +- .../bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'target/linux/bmips/patches-6.1') diff --git a/target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch index 15d44b34d1..42aec229f9 100644 --- a/target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch +++ b/target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch @@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski +}; --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -108,6 +108,10 @@ config I8259 +@@ -109,6 +109,10 @@ config I8259 bool select IRQ_DOMAIN diff --git a/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch b/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch index 3e0c67d9a4..e85056aee7 100644 --- a/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch +++ b/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch @@ -41,9 +41,9 @@ Signed-off-by: Álvaro Fernández Rojas help Build a generic DT-based kernel image that boots on select BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top ---- a/drivers/irqchip/Kconfig 2023-05-30 19:59:04.671531242 +0200 -+++ b/drivers/irqchip/Kconfig 2023-05-30 19:59:55.203880697 +0200 -@@ -121,7 +121,6 @@ config BCM6345_L1_IRQ +--- a/drivers/irqchip/Kconfig ++++ b/drivers/irqchip/Kconfig +@@ -122,7 +122,6 @@ config BCM6345_L1_IRQ config BCM7038_L1_IRQ tristate "Broadcom STB 7038-style L1/L2 interrupt controller driver" depends on ARCH_BRCMSTB || BMIPS_GENERIC @@ -51,7 +51,7 @@ Signed-off-by: Álvaro Fernández Rojas select GENERIC_IRQ_CHIP select IRQ_DOMAIN select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP -@@ -129,14 +128,12 @@ config BCM7038_L1_IRQ +@@ -130,14 +129,12 @@ config BCM7038_L1_IRQ config BCM7120_L2_IRQ tristate "Broadcom STB 7120-style L2 interrupt controller driver" depends on ARCH_BRCMSTB || BMIPS_GENERIC @@ -65,3 +65,4 @@ Signed-off-by: Álvaro Fernández Rojas - default ARCH_BCM2835 || ARCH_BRCMSTB || BMIPS_GENERIC select GENERIC_IRQ_CHIP select IRQ_DOMAIN + -- cgit v1.2.3