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 <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/21010
Signed-off-by: Hauke Mehrtens <[email protected]>

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 e2cab2042cfb9d16943b48e25924f074ae7c0fd0..74fc90ced8d0095953b29872c1dff433eadb65a0 100644 (file)
--- 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 <[email protected]>
        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 <[email protected]>
  #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 08085d957aeb02b6ca97ede59b3102279140fb02..392c873b0efd90b561d4793e11b5c2a93ff2f41d 100644 (file)
--- 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 780cf8d6e8017732f406ca559fb51bf8cc8fcdcb..73c2f33a104fc9f742cb9a9091fb8387f57221d1 100644 (file)
--- 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 4e1761b56705c42ddf15ce8a26e24e945d4a8d2c..52c1825bf7cc4a4995654032e71218cac479375e 100644 (file)
--- 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 <[email protected]>
  
 --- 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 <[email protected]>
        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