diff options
| author | gongzi miao | 2025-12-01 11:30:51 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-12-02 21:51:19 +0000 |
| commit | d0fcbddaadbfde60cc91bd3f44b3b9de36c3cc89 (patch) | |
| tree | cd37bb6c2df01ef08c8b8b106cca62dbd1dee08a | |
| parent | 141ac0b2bd1e7cbad1a75fe17a7b47a3778d16ca (diff) | |
| download | openwrt-d0fcbddaadbfde60cc91bd3f44b3b9de36c3cc89.tar.gz | |
kernel: bump 6.12 to 6.12.60
changelog:
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.60
Signed-off-by: gongzi miao <miaogongzi0227@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21010
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
4 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/bcm53xx/patches-6.12/905-BCM53573-minor-hacks.patch b/target/linux/bcm53xx/patches-6.12/905-BCM53573-minor-hacks.patch index e2cab2042c..74fc90ced8 100644 --- a/target/linux/bcm53xx/patches-6.12/905-BCM53573-minor-hacks.patch +++ b/target/linux/bcm53xx/patches-6.12/905-BCM53573-minor-hacks.patch @@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> clocks { --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -331,14 +331,6 @@ static int bcma_register_devices(struct +@@ -337,14 +337,6 @@ static int bcma_register_devices(struct } #endif @@ -36,7 +36,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> #ifdef CONFIG_BCMA_NFLASH if (bus->drv_cc.nflash.present) { err = platform_device_register(&bcma_nflash_dev); -@@ -418,6 +410,14 @@ int bcma_bus_register(struct bcma_bus *b +@@ -424,6 +416,14 @@ int bcma_bus_register(struct bcma_bus *b bcma_register_core(bus, core); } diff --git a/target/linux/generic/hack-6.12/810-bcma-ssb-fallback-sprom.patch b/target/linux/generic/hack-6.12/810-bcma-ssb-fallback-sprom.patch index 08085d957a..392c873b0e 100644 --- a/target/linux/generic/hack-6.12/810-bcma-ssb-fallback-sprom.patch +++ b/target/linux/generic/hack-6.12/810-bcma-ssb-fallback-sprom.patch @@ -51,7 +51,7 @@ Subject: [PATCH] ssb_sprom: add generic kernel support for Broadcom Fallback SP dev_err((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__) --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -671,6 +671,14 @@ static int __init bcma_modinit(void) +@@ -677,6 +677,14 @@ static int __init bcma_modinit(void) { int err; diff --git a/target/linux/generic/kernel-6.12 b/target/linux/generic/kernel-6.12 index 780cf8d6e8..73c2f33a10 100644 --- a/target/linux/generic/kernel-6.12 +++ b/target/linux/generic/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = .59 -LINUX_KERNEL_HASH-6.12.59 = a1d2cd7327f10eec022615c1bb12c06439bd110d2020164be97f698f43ca58be +LINUX_VERSION-6.12 = .60 +LINUX_KERNEL_HASH-6.12.60 = a63096b2147411d683cecbf87622bb2ff4885bac2b3641d3d4f10250c89cdcf8 diff --git a/target/linux/x86/patches-6.12/103-pcengines_apu6_platform.patch b/target/linux/x86/patches-6.12/103-pcengines_apu6_platform.patch index 4e1761b567..52c1825bf7 100644 --- a/target/linux/x86/patches-6.12/103-pcengines_apu6_platform.patch +++ b/target/linux/x86/patches-6.12/103-pcengines_apu6_platform.patch @@ -63,7 +63,7 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com> --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig -@@ -753,7 +753,7 @@ config XO1_RFKILL +@@ -754,7 +754,7 @@ config XO1_RFKILL laptop. config PCENGINES_APU2 @@ -72,7 +72,7 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com> depends on INPUT && INPUT_KEYBOARD && GPIOLIB depends on LEDS_CLASS select GPIO_AMD_FCH -@@ -761,7 +761,7 @@ config PCENGINES_APU2 +@@ -762,7 +762,7 @@ config PCENGINES_APU2 select LEDS_GPIO help This driver provides support for the front button and LEDs on |