diff --git a/Makefile.rhelver b/Makefile.rhelver index 61c2648c5..076ae9c59 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 = 47 +RHEL_RELEASE = 48 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 701f26bb2..3c91f7fce 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/196be8e5e1ea07defefc3de7415fb3823ac7b04a - 196be8e5e1ea07defefc3de7415fb3823ac7b04a tools/rtla: fix collision with glibc sched_attr/sched_set_attr +https://gitlab.com/cki-project/kernel-ark/-/commit/ae3292a75c733087a32a5bff4ac794976485b228 + ae3292a75c733087a32a5bff4ac794976485b228 tools/rtla: fix collision with glibc sched_attr/sched_set_attr -https://gitlab.com/cki-project/kernel-ark/-/commit/8451b49eb5c113f122847b8d0463326b0eb9d031 - 8451b49eb5c113f122847b8d0463326b0eb9d031 tools/rtla: drop __NR_sched_getattr +https://gitlab.com/cki-project/kernel-ark/-/commit/75fdb6d6835c67fc3db236011b3117573fc134cd + 75fdb6d6835c67fc3db236011b3117573fc134cd tools/rtla: drop __NR_sched_getattr https://gitlab.com/cki-project/kernel-ark/-/commit/0756902dd6b52af5d02b221e5ea50565d31a50e7 0756902dd6b52af5d02b221e5ea50565d31a50e7 Update the RHEL_DIFFERENCES help string diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 001379ffc..089bd9be7 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -4482,7 +4482,6 @@ CONFIG_MEMORY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index b0b0910a7..09d401a86 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -4457,7 +4457,6 @@ CONFIG_MEMORY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index b38f72a84..86a10758b 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3706,7 +3706,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 20305f203..fe0d82930 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3685,7 +3685,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d6289f284..d55bf753b 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4482,7 +4482,6 @@ CONFIG_MEMORY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 00beb79bf..9a9432d45 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3703,7 +3703,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 11ff850af..11b440625 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4457,7 +4457,6 @@ CONFIG_MEMORY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ae67b01be..3de9ca180 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3682,7 +3682,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 1d1382a29..1959ef82a 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -4487,7 +4487,6 @@ CONFIG_MEMORY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 9d28ba3c8..b03f703b9 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3744,7 +3744,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index bb11f78aa..07f860515 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -4462,7 +4462,6 @@ CONFIG_MEMORY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index f637c5f19..e93d02b56 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3723,7 +3723,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 4ab02d6c4..9298b265e 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3685,7 +3685,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index ce427b169..608457f7d 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3371,7 +3371,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index fd6778abb..d4e80c7ca 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3659,7 +3659,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 7f02747d3..6f7c86eaf 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3351,7 +3351,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 955bf29a3..7e8a5de2a 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -3686,7 +3686,6 @@ CONFIG_MEMORY_FAILURE=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index 043bf1237..0d69ae3ab 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -3660,7 +3660,6 @@ CONFIG_MEMORY_FAILURE=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index 27dce17da..aee9dae69 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -3691,7 +3691,6 @@ CONFIG_MEMORY_FAILURE=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index e376474b4..81a607781 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -3665,7 +3665,6 @@ CONFIG_MEMORY_FAILURE=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 70dc241be..e27dca05a 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3658,7 +3658,6 @@ CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index de21bcd4f..e0439c4e8 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3350,7 +3350,6 @@ CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 2a9950b0e..1b4db47d8 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3632,7 +3632,6 @@ CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 6a2dd9e5f..54a115b17 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3330,7 +3330,6 @@ CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 7f8fd43e8..fc8362bea 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3339,7 +3339,6 @@ CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m # CONFIG_MEMSTICK_REALTEK_USB is not set CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 59914876d..2212f3085 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4025,7 +4025,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ba6bffccb..6b3ff74d5 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3563,7 +3563,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 4872b142d..e21e81770 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4000,7 +4000,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 84831b23d..0908a5f84 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3543,7 +3543,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 3a1fb3a3d..11a0b5e46 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -4030,7 +4030,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 5d86282e2..08606e3e7 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3604,7 +3604,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index a20128f17..5fc986a9b 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -4005,7 +4005,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 8c3ab10e9..ebb24b0a7 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3584,7 +3584,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set diff --git a/kernel.changelog b/kernel.changelog index 939d5a03d..5e10d3587 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,13 @@ -* Thu Oct 31 2024 Fedora Kernel Team [6.12.0-0.rc5.0fc810ae3ae1.47] +* Fri Nov 01 2024 Fedora Kernel Team [6.12.0-0.rc5.6c52d4da1c74.48] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) Resolves: +* Fri Nov 01 2024 Fedora Kernel Team [6.12.0-0.rc5.6c52d4da1c74.47] +- redhat: configs: Drop CONFIG_MEMSTICK_REALTEK_PCI config option (Desnes Nunes) +- Linux v6.12.0-0.rc5.6c52d4da1c74 +Resolves: + * Thu Oct 31 2024 Fedora Kernel Team [6.12.0-0.rc5.0fc810ae3ae1.46] - Update the RHEL_DIFFERENCES help string (Don Zickus) - Put build framework for RT kernel in place for Fedora (Clark Williams) diff --git a/kernel.spec b/kernel.spec index f3009e7bd..23e69a2f9 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.rc5.20241031git0fc810ae3ae1.47 +%define pkgrelease 0.rc5.20241101git6c52d4da1c74.48 %define kversion 6 -%define tarfile_release 6.12-rc5-63-g0fc810ae3ae1 +%define tarfile_release 6.12-rc5-181-g6c52d4da1c74 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20241031git0fc810ae3ae1.47%{?buildid}%{?dist} +%define specrelease 0.rc5.20241101git6c52d4da1c74.48%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -4144,10 +4144,14 @@ fi\ # # %changelog -* Thu Oct 31 2024 Fedora Kernel Team [6.12.0-0.rc5.0fc810ae3ae1.47] +* Fri Nov 01 2024 Fedora Kernel Team [6.12.0-0.rc5.6c52d4da1c74.48] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) +* Fri Nov 01 2024 Fedora Kernel Team [6.12.0-0.rc5.6c52d4da1c74.47] +- redhat: configs: Drop CONFIG_MEMSTICK_REALTEK_PCI config option (Desnes Nunes) +- Linux v6.12.0-0.rc5.6c52d4da1c74 + * Thu Oct 31 2024 Fedora Kernel Team [6.12.0-0.rc5.0fc810ae3ae1.46] - Update the RHEL_DIFFERENCES help string (Don Zickus) - Put build framework for RT kernel in place for Fedora (Clark Williams) diff --git a/sources b/sources index c1a80cfc9..52d8c8d3b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12-rc5-63-g0fc810ae3ae1.tar.xz) = 5bb791b321f4d1d072508acf2ba6eb3239fe670bc1cebbc933087680b1eba517a07064bfdf0e27f3765c39a6f64d05317c36eeaf125aa5d79a8613b96d6361a4 -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = c00d817be716f979a1d43a5d9e58b8cd23f97a97d52eb3332035fedcab6dd2f48cf798d5b0675a0e941bbb1577ac052bdfa4435656b2d7ebf507e1ef5cce1147 -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = ba1a706f79d9fbdaa488ab6abff71bac1e4ed943b22d5b501d1898ae618d8b8912618bf2bac351f6cfb70e48e0564996cf7c1e8336495533c690f4ea7947399f +SHA512 (linux-6.12-rc5-181-g6c52d4da1c74.tar.xz) = 1f9a8b2aca8c37b6d09fb11505f3255cd40784bd675dc7433d7577cc8a8d7c7f369a82d6eaf2282bdc99e424355a67d7d0fe0f95ac11ec7d522fe0acd7d9eb8f +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 9fae7c1ecfca9c728aff4c78bedbbdc86b396f85cac9c6cc0dc5461ac01dbfadd806da461f10c47b75dde74a74991f62eb8c999c37a024e5c51d230263531a19 +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 3c23a658e29d70a3dfc83069511bd742cbfc8cf356d42aaa8436d3338bfbdd09d5e847341eda92b9a3a9d57085f54a8aeb8f1d563c21448f103b8243d418edfc