- updated to 6.12.15

diff --git a/kernel-x86.config b/kernel-x86.config
index 616bebb51bd8db7857aca28b71935587800ae702..6bdfc5702b39dce6eac5a8e7d535f0a3a39d2cbe 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.12.4 Kernel Configuration
+# Linux/x86 6.12.15 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 14.2.0 20241204 (release)"
 CONFIG_CC_IS_GCC=y
@@ -85,7 +85,6 @@ CONFIG_SPARSE_IRQ=y
 
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -2375,6 +2374,7 @@ CONFIG_EFI_EMBEDDED_FIRMWARE=y
 
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
+CONFIG_IMX_SCMI_MISC_DRV=m
 
 #
 # Qualcomm firmware drivers
@@ -3026,6 +3026,7 @@ CONFIG_PATA_LEGACY=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_BITMAP_FILE=y
+CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
@@ -9774,7 +9775,6 @@ CONFIG_PWM_TWL_LED=m
 #
 # IRQ chip support
 #
-CONFIG_LAN966X_OIC=m
 CONFIG_MADERA_IRQ=m
 # end of IRQ chip support
 
@@ -10998,8 +10998,6 @@ CONFIG_SCHED_INFO=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #

diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 4a7690dfefbf3371874b29635832977725ce706f..61c739d4891c6ac24d53cb7d326d1ce14ed401b6 100644 (file)
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.12.4 Kernel Configuration
+# Linux/x86 6.12.15 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 14.2.0 20241204 (release)"
 CONFIG_CC_IS_GCC=y
@@ -87,7 +87,6 @@ CONFIG_SPARSE_IRQ=y
 
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -2480,6 +2479,7 @@ CONFIG_EFI_EMBEDDED_FIRMWARE=y
 
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
+CONFIG_IMX_SCMI_MISC_DRV=m
 
 #
 # Qualcomm firmware drivers
@@ -3123,6 +3123,7 @@ CONFIG_PATA_LEGACY=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_BITMAP_FILE=y
+CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
@@ -9995,7 +9996,6 @@ CONFIG_PWM_TWL_LED=m
 #
 # IRQ chip support
 #
-CONFIG_LAN966X_OIC=m
 CONFIG_MADERA_IRQ=m
 # end of IRQ chip support
 
@@ -11292,8 +11292,6 @@ CONFIG_SCHED_INFO=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #

diff --git a/kernel.spec b/kernel.spec
index 38d50f1e2989d589de2d7b8e82ed27f891058a32..ba51be7deb56f1f9b31642ccc1ed51daadd4ea1d 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,7 +4,7 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         6.12
-%define                postver         6
+%define                postver         15
 %define                rel             1
 
 %define                __alt_kernel    %{nil}
@@ -36,7 +36,7 @@ Source0:      http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5: 844fae6a58c7f43af44d8cea8484b4a1
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Source1-md5: f481ede90f6efa1d8646424f8e63b46a
+# Source1-md5: e6bac97b6a983b3057dd932e24c38e02
 %endif
 
 Source2:       kernel-module-build.pl