diff --git a/Makefile.rhelver b/Makefile.rhelver index d9ac776dd..1e423fc3a 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 = 39 +RHEL_RELEASE = 42 # # RHEL_REBASE_NUM diff --git a/def_variants.yaml.fedora b/def_variants.yaml.fedora index b26cab12c..76827545a 100644 --- a/def_variants.yaml.fedora +++ b/def_variants.yaml.fedora @@ -12,10 +12,6 @@ packages: depends-on: - modules-core - modules - - name: modules-rt-kvm - if_variant_in: ["rt"] - depends-on: - - modules-core rules: @@ -23,9 +19,6 @@ rules: exact_pkg: True - .*test[^/]*.ko: modules-internal - - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm - if_variant_in: ["rt"] - - arch/.*: modules-core - crypto/.*: modules-core @@ -72,8 +65,6 @@ rules: - drivers/gpio/gpio-dln2.*: modules-extra - drivers/gpio/gpio-ljca.*: modules - drivers/gpio/.*: modules-core - - drivers/gpu/drm/i915/kvmgt.*: modules-rt-kvm - if_variant_in: ["rt"] - drivers/gpu/drm/display/drm_.*: modules-core - drivers/gpu/drm/drm.*: modules-core - drivers/gpu/drm/etnaviv/.*: modules-core @@ -252,8 +243,6 @@ rules: - drivers/powercap/intel_rapl_tpmi.*: modules - drivers/powercap/.*: modules-core - drivers/pps/.*: modules-core - - drivers/ptp/ptp_kvm.*: modules-rt-kvm - if_variant_in: ["rt"] - drivers/ptp/ptp_mock.*: modules-internal - drivers/ptp/ptp_dfl_tod.*: modules - drivers/ptp/.*: modules-core diff --git a/kernel.changelog b/kernel.changelog index 0a49fe467..21c8cf435 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,17 @@ +* Mon May 05 2025 Fedora Kernel Team [6.15.0-0.rc5.42] +- Linux v6.15.0-0.rc5 +Resolves: + +* Sun May 04 2025 Fedora Kernel Team [6.15.0-0.rc4.e8ab83e34bdc.41] +- Linux v6.15.0-0.rc4.e8ab83e34bdc +Resolves: + +* Sat May 03 2025 Fedora Kernel Team [6.15.0-0.rc4.95d3481af6dc.40] +- Turn on ACPI_DEBUG for Fedora (Justin M. Forbes) +- redhat: fix kernel-rt-kvm package removal for Fedora (Thorsten Leemhuis) +- Linux v6.15.0-0.rc4.95d3481af6dc +Resolves: + * Fri May 02 2025 Fedora Kernel Team [6.15.0-0.rc4.ebd297a2affa.39] - redhat/configs: aarch64: Enable Apple touchbar display driver for Fedora (Neal Gompa) - Linux v6.15.0-0.rc4.ebd297a2affa diff --git a/kernel.spec b/kernel.spec index 08fd55fa0..2d8e9334a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.15.0 %define specversion 6.15.0 %define patchversion 6.15 -%define pkgrelease 0.rc4.20250502gitebd297a2affa.39 +%define pkgrelease 0.rc5.42 %define kversion 6 -%define tarfile_release 6.15-rc4-147-gebd297a2affa +%define tarfile_release 6.15-rc5 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20250502gitebd297a2affa.39%{?buildid}%{?dist} +%define specrelease 0.rc5.42%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -4230,8 +4230,16 @@ fi\ # # %changelog -* Fri May 02 2025 Justin M. Forbes [6.15.0-0.rc4.20250502gitebd297a2affa.39] +* Mon May 05 2025 Fedora Kernel Team [6.15.0-0.rc5.42] +- Linux v6.15.0-0.rc5 + +* Sun May 04 2025 Fedora Kernel Team [6.15.0-0.rc4.e8ab83e34bdc.41] +- Linux v6.15.0-0.rc4.e8ab83e34bdc + +* Sat May 03 2025 Fedora Kernel Team [6.15.0-0.rc4.95d3481af6dc.40] - Turn on ACPI_DEBUG for Fedora (Justin M. Forbes) +- redhat: fix kernel-rt-kvm package removal for Fedora (Thorsten Leemhuis) +- Linux v6.15.0-0.rc4.95d3481af6dc * Fri May 02 2025 Fedora Kernel Team [6.15.0-0.rc4.ebd297a2affa.39] - redhat/configs: aarch64: Enable Apple touchbar display driver for Fedora (Neal Gompa) diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index f56803d1c..02e22c247 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -190,7 +190,7 @@ index 000000000000..85771d74c34f + +endmenu diff --git a/Makefile b/Makefile -index 94be5dfb81fb..f0c337e2cd55 100644 +index b29cc321ffd9..135c6b5ebc36 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 19f232c7b..543328ea7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15-rc4-147-gebd297a2affa.tar.xz) = 7d290817aed0934a1547dc9ed6b784499a71b254717fa8eda006a19806a282b901588026de02121c0c1e2a52cad4124a39123d22431277c271ca097b88587fd6 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 97270d56011b14ec842bea8f4afbe0c7e181c034c1f17e2797435719124e6d3b312404d1a463d5e38245b07a8e2e976a74e3ded57efd104da123659554c89bfb -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 15dd96a9ade9ddddc88256ee7535bde056691314cb36d4e5a7a135f292fb8974d2746ccd659c2ba6a74458d406204ad68c0221d7db74b249e24c31002da1bc80 +SHA512 (linux-6.15-rc5.tar.xz) = 2da74ef8ad21543c12d96ab7f4171dce215f90845dfa72b8204d5d0d53ab4cf1a3db8e88575887af4006332b0db8974b60495e8e5c5407280fcf10b50e7b4878 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = c7800f955490d2085bdfaabf307b9fff79d61959a16f02d972703239183cf2d7f9b36888cfba21bd9af38e8e00aa36473c6b701be8321abb676c9d9f308c92e9 +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = f585a61989e132a555667a02726fd8788783742abf6e7e28f274398b45288a9dd793f9510b778068c70ab02cd2cc0babcd2eeb9251b3d455dea20973842e1ef0