diff --git a/Makefile.rhelver b/Makefile.rhelver index 8f0230ed4..645be0a98 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 # # ZSTREAM diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 7182e1282..52802790c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2544,7 +2544,7 @@ CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_SPEED_SELECT_INTERFACE=m -# CONFIG_INTEL_TCC_COOLING is not set +CONFIG_INTEL_TCC_COOLING=m CONFIG_INTEL_TDX_GUEST=y CONFIG_INTEL_TH_ACPI=m # CONFIG_INTEL_TH_DEBUG is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 7b51d8dae..96516d17a 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2528,7 +2528,7 @@ CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_SPEED_SELECT_INTERFACE=m -# CONFIG_INTEL_TCC_COOLING is not set +CONFIG_INTEL_TCC_COOLING=m CONFIG_INTEL_TDX_GUEST=y CONFIG_INTEL_TH_ACPI=m # CONFIG_INTEL_TH_DEBUG is not set diff --git a/kernel.spec b/kernel.spec index a070cb6db..2fa6a051a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -143,13 +143,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.3.0 %define patchversion 6.3 -%define pkgrelease 0.rc4.20230331git62bad54b26db.39 +%define pkgrelease 0.rc5.42 %define kversion 6 -%define tarfile_release 6.3-rc4-161-g62bad54b26db +%define tarfile_release 6.3-rc5 # This is needed to do merge window version magic %define patchlevel 3 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20230331git62bad54b26db.39%{?buildid}%{?dist} +%define specrelease 0.rc5.42%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.3.0 @@ -3360,6 +3360,16 @@ fi # # %changelog +* Mon Apr 03 2023 Fedora Kernel Team [6.3.0-0.rc5.42] +- Linux v6.3.0-0.rc5 + +* Sun Apr 02 2023 Fedora Kernel Team [6.3.0-0.rc4.00c7b5f4ddc5.41] +- Linux v6.3.0-0.rc4.00c7b5f4ddc5 + +* Sat Apr 01 2023 Fedora Kernel Team [6.3.0-0.rc4.7b50567bdcad.40] +- redhat/configs: enable CONFIG_INTEL_TCC_COOLING for RHEL (David Arcari) +- Linux v6.3.0-0.rc4.7b50567bdcad + * Fri Mar 31 2023 Fedora Kernel Team [6.3.0-0.rc4.62bad54b26db.39] - Update Fedora ppc filters after config updates (Justin M. Forbes) - Update Fedora aarch64 filters after config updates (Justin M. Forbes) diff --git a/patch-6.3-redhat.patch b/patch-6.3-redhat.patch index 773a14303..08e60b1bc 100644 --- a/patch-6.3-redhat.patch +++ b/patch-6.3-redhat.patch @@ -119,7 +119,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index da2586d4c728..7efbc45514bd 100644 +index ef4e96b9cd5b..44e93d66bab4 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -2879,7 +2879,7 @@ index 000000000000..c55fb108c6bb +} +EXPORT_SYMBOL(mark_partner_supported); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index efff8078e395..1b4f8306cea6 100644 +index 9466b6a2abae..83ba3c9b4406 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,6 +22,7 @@ diff --git a/sources b/sources index 1fcabbc8d..e3b66b9a2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.3-rc4-161-g62bad54b26db.tar.xz) = 627f51a68be1b859143e838ed756ea6f785564216e2ae252d74c7b7861c22029782fca31440da2bb7aec2486731a70c58317e80f265635d052f3bbcfb42a0ab8 -SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 59e4a2e877ec60a00bafce2cf79873167b8ac870d1585efb63590594f0b4cd70d383019998be01ce0b3a47b9af8521e1fae36489793a7bab01def26c8fdd6e7e -SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = d7e4835028d48961bc9c5b6292e01318868f259b031e771af07b8b8634d1c7818ba3634c255daa31b027763ca69635a5bcc14830b4ef0b4ab73b95e575f02c4d +SHA512 (linux-6.3-rc5.tar.xz) = 851fde27401e687cbdb664d48a0f890db512c41e31d0e27a3aa3343fddebfa3fe864cd13aee5b6b549f3f2460ba61a74eba65414b2c73d2437c087c71c11e6ff +SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = b7b6a5c79ef7a6b2e215e94332773fa48ba87ca63c645833721733083f85ddede6af56d4de3f6c31b193a5685253920c4b359bbf5efac4be2ddb0fc2000cbba8 +SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 06e858208a4206ded69ea4d478e805e39293a1c9134f59da50d1d3f8411136fe258954f1cf062db25e61868588c82d025dd90a0bb7641beaa23d81775e173568