diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index a1b84221e..182a666ec 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2735,6 +2735,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index b44e56c50..9b1e0fada 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2716,6 +2716,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 6edc4500d..31c7af529 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -2745,6 +2745,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index ad2c22597..0d2da7c64 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -2726,6 +2726,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config
index 176675b4d..de08d109b 100644
--- a/kernel-riscv64-rt-debug-fedora.config
+++ b/kernel-riscv64-rt-debug-fedora.config
@@ -2750,6 +2750,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config
index 512dc76f7..0f914c80f 100644
--- a/kernel-riscv64-rt-fedora.config
+++ b/kernel-riscv64-rt-fedora.config
@@ -2731,6 +2731,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 66dee3069..def66839e 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2710,6 +2710,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index ca4bbd86a..eec04ff7b 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2691,6 +2691,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 5287cd613..ddfe31743 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2976,6 +2976,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 0d526c87c..f956b80c7 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2957,6 +2957,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config
index 3f7099225..c254b92c3 100644
--- a/kernel-x86_64-rt-debug-fedora.config
+++ b/kernel-x86_64-rt-debug-fedora.config
@@ -2981,6 +2981,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config
index 59253be47..7ee48ee2d 100644
--- a/kernel-x86_64-rt-fedora.config
+++ b/kernel-x86_64-rt-fedora.config
@@ -2962,6 +2962,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_SCMI_MISC_DRV=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel.changelog b/kernel.changelog
index 88e5eec81..d321f6a94 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,8 @@
+* Fri Dec 27 2024 Augusto Caringi <acaringi@redhat.com> [6.12.7-0]
+- Fix up CONFIG_IMX_SCMI_MISC_DRV config for Fedora (Augusto Caringi)
+- Linux v6.12.7
+Resolves: 
+
 * Thu Dec 19 2024 Augusto Caringi <acaringi@redhat.com> [6.12.6-0]
 - Linux v6.12.6
 Resolves: 
diff --git a/kernel.spec b/kernel.spec
index af5ff7031..ff029cccc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -159,18 +159,18 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specrpmversion 6.12.6
-%define specversion 6.12.6
+%define specrpmversion 6.12.7
+%define specversion 6.12.7
 %define patchversion 6.12
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.12.6
+%define tarfile_release 6.12.7
 # This is needed to do merge window version magic
 %define patchlevel 12
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 200%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.12.6
+%define kabiversion 6.12.7
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -4164,6 +4164,10 @@ fi\
 #
 #
 %changelog
+* Fri Dec 27 2024 Augusto Caringi <acaringi@redhat.com> [6.12.7-0]
+- Fix up CONFIG_IMX_SCMI_MISC_DRV config for Fedora (Augusto Caringi)
+- Linux v6.12.7
+
 * Thu Dec 19 2024 Augusto Caringi <acaringi@redhat.com> [6.12.6-0]
 - Linux v6.12.6
 
diff --git a/patch-6.12-redhat.patch b/patch-6.12-redhat.patch
index d32f8634e..19071e37e 100644
--- a/patch-6.12-redhat.patch
+++ b/patch-6.12-redhat.patch
@@ -58,7 +58,7 @@
  57 files changed, 3004 insertions(+), 262 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index c10952585c14..e29092e1228c 100644
+index 685a57f6c8d2..f7eb7e513461 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -860,7 +860,7 @@ index b0d00032479d..afb9544fb007 100644
  /*
   * DIAG 308 support
 diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index f17bb7bf9392..66e530380ee3 100644
+index 5fa203f4bc6b..80761c2b63fe 100644
 --- a/arch/s390/kernel/ipl.c
 +++ b/arch/s390/kernel/ipl.c
 @@ -2479,3 +2479,8 @@ int ipl_report_free(struct ipl_report *report)
diff --git a/sources b/sources
index bb3ba6a74..63467409f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.12.6.tar.xz) = a54ef882c04a944f7dfb70913cec8269838f6efabcfd1a842d441b44c8c8dc8a3dbd9e360c4386a6fb27af1a0fe6ea2160af47625de3c326b3cc1cd9010049c4
-SHA512 (kernel-abi-stablelists-6.12.6.tar.xz) = b2b278741840d30a1d603d5bc03b860e480df232b7a6b2ff92e0a827278d79b7b04ff5d92633328ac97a6aec47ff4fa10cf7c0d2cfad107183125c31a995d1d9
-SHA512 (kernel-kabi-dw-6.12.6.tar.xz) = 39ad9b509a5224fc985b38e68f67f3774366b8a999c0f889ca8ad25cf8a0b75716f5086bcf11eb9d83665e5c4a791ecf1547bf570248e0bd9ef993eb3346117c
+SHA512 (linux-6.12.7.tar.xz) = 520c216f9ba756c9c49570109f6a799dc7b6800e308cffc80830834dae5358883f20820397eb89590871f59d5781a3674b40d2634b412e408ed30d4eb1010acd
+SHA512 (kernel-abi-stablelists-6.12.7.tar.xz) = 9c4136348c470f66125534b91bc476de44fb09e8adb77b3737a23443d9085df05119fc1cc62a9bbc05e777fad3ea2a2d141649c60d4bca3fac832d5eec169f50
+SHA512 (kernel-kabi-dw-6.12.7.tar.xz) = fdf3ddadb6b611b77888234b58acf887474c4aa0123a04d71745c004c5950e5274a828c0b209b5c654462f1aba52e574210e827addeb317aacbbe9c503705509