From 8503de9bac34a751a7089494292beed35ef7959b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 9 Oct 2024 08:26:13 -0600 Subject: [PATCH] kernel-6.12.0-0.rc2.20241009git75b607fab38d.26 * Wed Oct 09 2024 Fedora Kernel Team [6.12.0-0.rc2.75b607fab38d.26] - Turn on ZRAM_WRITEBACK for Fedora (Justin M. Forbes) - Linux v6.12.0-0.rc2.75b607fab38d Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-riscv64-debug-fedora.config | 2 +- kernel-riscv64-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.changelog | 5 +++++ kernel.spec | 10 +++++++--- sources | 6 +++--- 16 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 96c4e2660..5ec3fb3a4 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 = 25 +RHEL_RELEASE = 26 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index c9bb72012..41b8ee8b4 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -10367,7 +10367,7 @@ CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_MULTI_COMP=y CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 908f15a83..1c3006ba5 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -10338,7 +10338,7 @@ CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 7e631c830..98c75d752 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -10366,7 +10366,7 @@ CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_MULTI_COMP=y CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index df552a3d2..c336ea20c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -10337,7 +10337,7 @@ CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 72510d4fa..9c35d703b 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -8575,7 +8575,7 @@ CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_MULTI_COMP=y CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index aaafec46a..8c30166b3 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -8544,7 +8544,7 @@ CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index bc08c2739..a992bac91 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -8681,7 +8681,7 @@ CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_MULTI_COMP=y CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index c8fab5e91..8bd9d1eaa 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -8650,7 +8650,7 @@ CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 90623053a..b492a65e8 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -8510,7 +8510,7 @@ CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_MULTI_COMP=y CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index de0b55a1d..5962f9f2b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -8479,7 +8479,7 @@ CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 88bc4aa9a..7f74d14b9 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -9213,7 +9213,7 @@ CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_MULTI_COMP=y CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 306652351..15a754c8e 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -9183,7 +9183,7 @@ CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC=y diff --git a/kernel.changelog b/kernel.changelog index 0c74b8b1c..76275d6f1 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Wed Oct 09 2024 Fedora Kernel Team [6.12.0-0.rc2.75b607fab38d.26] +- Turn on ZRAM_WRITEBACK for Fedora (Justin M. Forbes) +- Linux v6.12.0-0.rc2.75b607fab38d +Resolves: + * Tue Oct 08 2024 Fedora Kernel Team [6.12.0-0.rc2.87d6aab2389e.25] - configs: rhel: Fix designware I2C controllers related config settings (Hans de Goede) - Enable CONFIG_DMA_NUMA_CMA for x86_64 and aarch64 (Chris von Recklinghausen) diff --git a/kernel.spec b/kernel.spec index a5a6aca04..741f6703e 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.rc2.20241008git87d6aab2389e.25 +%define pkgrelease 0.rc2.20241009git75b607fab38d.26 %define kversion 6 -%define tarfile_release 6.12-rc2-6-g87d6aab2389e +%define tarfile_release 6.12-rc2-58-g75b607fab38d # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20241008git87d6aab2389e.25%{?buildid}%{?dist} +%define specrelease 0.rc2.20241009git75b607fab38d.26%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -4136,6 +4136,10 @@ fi\ # # %changelog +* Wed Oct 09 2024 Fedora Kernel Team [6.12.0-0.rc2.75b607fab38d.26] +- Turn on ZRAM_WRITEBACK for Fedora (Justin M. Forbes) +- Linux v6.12.0-0.rc2.75b607fab38d + * Tue Oct 08 2024 Fedora Kernel Team [6.12.0-0.rc2.87d6aab2389e.25] - configs: rhel: Fix designware I2C controllers related config settings (Hans de Goede) - Enable CONFIG_DMA_NUMA_CMA for x86_64 and aarch64 (Chris von Recklinghausen) diff --git a/sources b/sources index bc5c7ac8d..3fe0a67bf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12-rc2-6-g87d6aab2389e.tar.xz) = fe80ba29b9536c3a96257fa8d85c6c484498e0d438486acf8e0017b2301233bfd9a3a7346741f990d756d588040c8054e2eb6138ff300ef3fc39a84d69d884c1 -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 47b8fe28721c46095be9b87f09d45880ded186cf87213c9bb6484ef997fdaade0f8e0765137dd116997c19d827cf6f135f772816c4963b24173d887a559daedf -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 128f61ec53155f4b91620376eef8551a21cc5785c9787e375806d43b09b69a1d8bea14c2c47ac49e409563eb93535ac8b6c3b542f2df4e142ca95bf4f9dcc2aa +SHA512 (linux-6.12-rc2-58-g75b607fab38d.tar.xz) = 6db89a1bf2368bdc6add6783c8da50d87ba88094ddd29d0a6c8a3c0965ffdf7018581cc92efd5c09a14d7a57f5ef569f068532946dcf96088bbb5f953eb2874a +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 8b02ed2f258610aaca758d713c785f38e1827242176af813e44f7773726c2e67c3232bebdcccfaf7a94b749e84dd36dd706ef2fc2924ec5496d857a383a8f8ba +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 1ca710a308bcbc49dbbda1b8b25fb912ab194b68f5fb6c2507f1ec39b17caed04eeec6cca3f21b8b7dc31c1891e12bd1fd243f11e2ae9c850624131d09b78781