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>
This commit is contained in:
gongzi miao 2025-12-01 19:30:51 +08:00 committed by Hauke Mehrtens
parent 141ac0b2bd
commit d0fcbddaad
4 changed files with 7 additions and 7 deletions

View file

@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
clocks { clocks {
--- a/drivers/bcma/main.c --- a/drivers/bcma/main.c
+++ b/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 #endif
@ -36,7 +36,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
#ifdef CONFIG_BCMA_NFLASH #ifdef CONFIG_BCMA_NFLASH
if (bus->drv_cc.nflash.present) { if (bus->drv_cc.nflash.present) {
err = platform_device_register(&bcma_nflash_dev); 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); bcma_register_core(bus, core);
} }

View file

@ -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__) dev_err((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
--- a/drivers/bcma/main.c --- a/drivers/bcma/main.c
+++ b/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; int err;

View file

@ -1,2 +1,2 @@
LINUX_VERSION-6.12 = .59 LINUX_VERSION-6.12 = .60
LINUX_KERNEL_HASH-6.12.59 = a1d2cd7327f10eec022615c1bb12c06439bd110d2020164be97f698f43ca58be LINUX_KERNEL_HASH-6.12.60 = a63096b2147411d683cecbf87622bb2ff4885bac2b3641d3d4f10250c89cdcf8

View file

@ -63,7 +63,7 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
--- a/drivers/platform/x86/Kconfig --- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig
@@ -753,7 +753,7 @@ config XO1_RFKILL @@ -754,7 +754,7 @@ config XO1_RFKILL
laptop. laptop.
config PCENGINES_APU2 config PCENGINES_APU2
@ -72,7 +72,7 @@ Sighed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
depends on INPUT && INPUT_KEYBOARD && GPIOLIB depends on INPUT && INPUT_KEYBOARD && GPIOLIB
depends on LEDS_CLASS depends on LEDS_CLASS
select GPIO_AMD_FCH select GPIO_AMD_FCH
@@ -761,7 +761,7 @@ config PCENGINES_APU2 @@ -762,7 +762,7 @@ config PCENGINES_APU2
select LEDS_GPIO select LEDS_GPIO
help help
This driver provides support for the front button and LEDs on This driver provides support for the front button and LEDs on