diff --git a/Makefile.rhelver b/Makefile.rhelver index 3606a7785..1805083e6 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 12 +RHEL_RELEASE = 13 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index accec8c0f..6c208f3e4 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -1899,7 +1899,7 @@ CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set CONFIG_DMA_CMA=y CONFIG_DMADEVICES_DEBUG=y -CONFIG_DMADEVICES_VDEBUG=y +# CONFIG_DMADEVICES_VDEBUG is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set @@ -6992,6 +6992,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SH is not set CONFIG_RTC_DRV_SNVS=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index f568320be..052d58d4b 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6965,6 +6965,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SH is not set CONFIG_RTC_DRV_SNVS=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 8116ea38f..388ee8201 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -5625,6 +5625,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 134371e86..059f62f2a 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -5602,6 +5602,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 1f3db00fd..c0c2e8d50 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1899,7 +1899,7 @@ CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set CONFIG_DMA_CMA=y CONFIG_DMADEVICES_DEBUG=y -CONFIG_DMADEVICES_VDEBUG=y +# CONFIG_DMADEVICES_VDEBUG is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set @@ -6991,6 +6991,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SH is not set CONFIG_RTC_DRV_SNVS=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 83651a998..38366c5bf 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5621,6 +5621,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1e5265122..effcd91e1 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6964,6 +6964,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SH is not set CONFIG_RTC_DRV_SNVS=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b98118a61..292eca090 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5598,6 +5598,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 83f2f12b7..6be351147 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -5667,6 +5667,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index a7ff9e03f..d6c217f6e 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -5644,6 +5644,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index cdb44f827..5117b3e59 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1414,7 +1414,7 @@ CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set # CONFIG_DMA_CMA is not set CONFIG_DMADEVICES_DEBUG=y -CONFIG_DMADEVICES_VDEBUG=y +# CONFIG_DMADEVICES_VDEBUG is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set @@ -5671,6 +5671,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 23051120a..3b0036b08 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -5159,6 +5159,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index cc8627832..90c6a73e7 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5642,6 +5642,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index e7e18f907..40a3ec216 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -5138,6 +5138,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index e2283f88a..6d012bc89 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -1437,7 +1437,7 @@ CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set # CONFIG_DMA_CMA is not set CONFIG_DMADEVICES_DEBUG=y -CONFIG_DMADEVICES_VDEBUG=y +# CONFIG_DMADEVICES_VDEBUG is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set @@ -5715,6 +5715,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index ca9f755e4..f2e7108f2 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -5686,6 +5686,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 071e6d4b9..2e4c49bb4 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1420,7 +1420,7 @@ CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set # CONFIG_DMA_CMA is not set CONFIG_DMADEVICES_DEBUG=y -CONFIG_DMADEVICES_VDEBUG=y +# CONFIG_DMADEVICES_VDEBUG is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set @@ -5587,6 +5587,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ef238dbc9..43a402e65 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -5087,6 +5087,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b6fd5413e..ab8593301 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5558,6 +5558,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 3f2e0f5cc..29c61e4ea 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -5066,6 +5066,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 96906bdc6..185569de7 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -5078,6 +5078,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 9e76a59fe..a57743ac2 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1545,7 +1545,7 @@ CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set CONFIG_DMA_CMA=y CONFIG_DMADEVICES_DEBUG=y -CONFIG_DMADEVICES_VDEBUG=y +# CONFIG_DMADEVICES_VDEBUG is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set @@ -6090,6 +6090,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 18e9ba17d..e0f273f8f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4529,7 +4529,7 @@ CONFIG_NTB_TRANSPORT=m # CONFIG_NULL_TTY is not set CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA_BALANCING=y -# CONFIG_NUMA_EMU is not set +CONFIG_NUMA_EMU=y CONFIG_NUMA=y CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y @@ -5375,6 +5375,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 726193bed..91d23c1e8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6062,6 +6062,7 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_SD2405AL is not set CONFIG_RTC_DRV_SD3078=m # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 4b827f59c..d2c22f07b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4509,7 +4509,7 @@ CONFIG_NTB_TRANSPORT=m # CONFIG_NULL_TTY is not set CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA_BALANCING=y -# CONFIG_NUMA_EMU is not set +CONFIG_NUMA_EMU=y CONFIG_NUMA=y CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y @@ -5353,6 +5353,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index eb9652856..e0018632e 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -4569,7 +4569,7 @@ CONFIG_NTB_TRANSPORT=m # CONFIG_NULL_TTY is not set CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA_BALANCING=y -# CONFIG_NUMA_EMU is not set +CONFIG_NUMA_EMU=y CONFIG_NUMA=y CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y @@ -5421,6 +5421,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 84a1a451d..546cdde8b 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -4549,7 +4549,7 @@ CONFIG_NTB_TRANSPORT=m # CONFIG_NULL_TTY is not set CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA_BALANCING=y -# CONFIG_NUMA_EMU is not set +CONFIG_NUMA_EMU=y CONFIG_NUMA=y CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y @@ -5399,6 +5399,7 @@ CONFIG_RTC_DRV_RX8025=m # CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_SD2405AL is not set # CONFIG_RTC_DRV_SD3078 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel.changelog b/kernel.changelog index a8884b12f..3d309ff79 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Thu Sep 26 2024 Fedora Kernel Team [6.12.0-0.rc0.11a299a7933e.13] +- [fedora] configs: add end of file newline to CONFIG_DMADEVICES_VDEBUG (Patrick Talbert) +- unset CONFIG_DMADEVICES_VDEBUG (cmurf) +- Linux v6.12.0-0.rc0.11a299a7933e +Resolves: + * Wed Sep 25 2024 Fedora Kernel Team [6.12.0-0.rc0.684a64bf32b6.12] - Revert "Merge branch 'drop_engine_api' into 'os-build'" (Justin M. Forbes) - Linux v6.12.0-0.rc0.684a64bf32b6 diff --git a/kernel.spec b/kernel.spec index 7732498ac..aba13de51 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 0.rc0.20240925git684a64bf32b6.12 +%define pkgrelease 0.rc0.20240926git11a299a7933e.13 %define kversion 6 -%define tarfile_release 6.11-10547-g684a64bf32b6 +%define tarfile_release 6.11-10669-g11a299a7933e # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20240925git684a64bf32b6.12%{?buildid}%{?dist} +%define specrelease 0.rc0.20240926git11a299a7933e.13%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -4136,6 +4136,11 @@ fi\ # # %changelog +* Thu Sep 26 2024 Fedora Kernel Team [6.12.0-0.rc0.11a299a7933e.13] +- [fedora] configs: add end of file newline to CONFIG_DMADEVICES_VDEBUG (Patrick Talbert) +- unset CONFIG_DMADEVICES_VDEBUG (cmurf) +- Linux v6.12.0-0.rc0.11a299a7933e + * Wed Sep 25 2024 Fedora Kernel Team [6.12.0-0.rc0.684a64bf32b6.12] - Revert "Merge branch 'drop_engine_api' into 'os-build'" (Justin M. Forbes) - Linux v6.12.0-0.rc0.684a64bf32b6 diff --git a/patch-6.12-redhat.patch b/patch-6.12-redhat.patch index d9a457278..6e1d808ff 100644 --- a/patch-6.12-redhat.patch +++ b/patch-6.12-redhat.patch @@ -191,7 +191,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index dfc7b0753e50..3bc8b562e6a7 100644 +index 265dd990a9b6..f3b881eee600 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -231,7 +231,7 @@ index dfc7b0753e50..3bc8b562e6a7 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1238,7 +1261,13 @@ define filechk_version.h +@@ -1251,7 +1274,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -246,7 +246,7 @@ index dfc7b0753e50..3bc8b562e6a7 100644 endef $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) -@@ -1846,6 +1875,23 @@ endif +@@ -1859,6 +1888,23 @@ endif ifdef CONFIG_MODULES @@ -287,10 +287,10 @@ index 749179a1d162..3382d64828e4 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 49f054dcd4de..e3a767d91399 100644 +index 3e29b44d2d7b..094913c5059d 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1370,7 +1370,7 @@ endchoice +@@ -1382,7 +1382,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -1945,7 +1945,7 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index ca9959a8fb9e..95de34390bfa 100644 +index ba6508455e18..8e88be5e6938 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -263,6 +263,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -2015,7 +2015,7 @@ index ca9959a8fb9e..95de34390bfa 100644 #ifdef CONFIG_NVME_HOST_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 518e22dd4f9b..af7d1591e9c6 100644 +index 48e7a8906d01..e649b3d1e260 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -83,14 +83,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -2051,7 +2051,7 @@ index 518e22dd4f9b..af7d1591e9c6 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -1000,8 +1006,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -1008,8 +1014,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ diff --git a/sources b/sources index 9bc4a210e..b66560077 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-10547-g684a64bf32b6.tar.xz) = 8d7c61325db417027aed3ccea69ab2086d5e2535088a06bc3f8a2bf2b9b714b331e42df6c341ba14a560e6015fec443785e0a64ff83a77878bd50622305fa7c9 -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 5375475921149c1c7bfcaec381cef243d1c18567e37651102a63597d15b68f429b123983f441be4bc544d6509d08c5eea89d1177c301701571bce19813c443c7 -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 8565e90e06c40ea536df321f87c34d42c84cb2d600e6f163203cf477febae2166a1aad42fcc16725f61f92db4f2415e9fd399d4ec3bf6fad88304aa0dfd4484c +SHA512 (linux-6.11-10669-g11a299a7933e.tar.xz) = bd638678ffe827150171eb651f9f640bfffbf185d7ecc7e689e935cec4c5d4e53e17735c9c1a58bb6added5db419303ab0c727ea621f31f557dcf54e50419342 +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 86ad1f4fca0d6adb159d5b539e7a0cb1f54902a0bdde5501fbf9eb8b273c0e03b7256ca4990d635ef8d9705a67f898dd78dd5c0cee85cbc27c19a40c0727e2a5 +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 80c44d36d318c3c782ef5de968d125d66b8089662504a450c06879839bccd8dd943c712c775a37acf3daa62ac3468e6b37cc02cec9e8f089dd65b584dd5fc8b7