diff --git a/Makefile.rhelver b/Makefile.rhelver index 9e42da42f..47598f6b1 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 = 22 +RHEL_RELEASE = 24 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index c7721f015..392f4aae1 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,11 @@ +* Mon Oct 07 2024 Fedora Kernel Team [6.12.0-0.rc2.24] +- Linux v6.12.0-0.rc2 +Resolves: + +* Sun Oct 06 2024 Fedora Kernel Team [6.12.0-0.rc1.8f602276d390.23] +- Linux v6.12.0-0.rc1.8f602276d390 +Resolves: + * Sat Oct 05 2024 Fedora Kernel Team [6.12.0-0.rc1.27cc6fdf7201.22] - Linux v6.12.0-0.rc1.27cc6fdf7201 Resolves: diff --git a/kernel.spec b/kernel.spec index 06d83c2dc..a1154d55d 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.rc1.20241005git27cc6fdf7201.22 +%define pkgrelease 0.rc2.24 %define kversion 6 -%define tarfile_release 6.12-rc1-306-g27cc6fdf7201 +%define tarfile_release 6.12-rc2 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20241005git27cc6fdf7201.22%{?buildid}%{?dist} +%define specrelease 0.rc2.24%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -4136,6 +4136,12 @@ fi\ # # %changelog +* Mon Oct 07 2024 Fedora Kernel Team [6.12.0-0.rc2.24] +- Linux v6.12.0-0.rc2 + +* Sun Oct 06 2024 Fedora Kernel Team [6.12.0-0.rc1.8f602276d390.23] +- Linux v6.12.0-0.rc1.8f602276d390 + * Sat Oct 05 2024 Fedora Kernel Team [6.12.0-0.rc1.27cc6fdf7201.22] - Linux v6.12.0-0.rc1.27cc6fdf7201 diff --git a/patch-6.12-redhat.patch b/patch-6.12-redhat.patch index aa7bb26b8..2048adaef 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 187a4ce2728e..401f0ebe6f90 100644 +index c5493c0c0ca1..911169d948df 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 5f4884abd..07d00733e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12-rc1-306-g27cc6fdf7201.tar.xz) = 9c8b878d286bda9cbd071fbcd0dd270e5201a8eb58cc534b38f862cc3ad4124499a4719681b13e9a274b4450f4e4cb34492f88ede366fcd56485d6ddd3f97aad -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = b15ce99e8a7c0c4e442795acd34520ac3ec24f1c8dfaea1bd68efbdd07857c51efc18ec0cacd768cc30a42cd50f090c92082ae0ac0eda691d38fd0ea1dd00955 -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = a43b02584000685868cfe9cc6ecb022920299afe8d054f28496d7c64769c3ca2c2c3fd70e6e8d25b2b29665d8a733bb45e8b362e1fc0a2ee9802c7adce28519c +SHA512 (linux-6.12-rc2.tar.xz) = 0161956c6031a9c21032ff3dba47ca1428e2e001e4476a6a069048350b84631a4309ffb64e6419ca6bfb359824926457dcae6715e3d4fc2de48589176b90546c +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = a061172bb9393006b87b149d3fbcd3b649d9fe153731ff8d4d526ebf234753467958ddbb3b0e245f8c2b977c70a6dc662be007d49c5e047f8ec644129d877021 +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 542c488dd7ba14c66085453a4af271753c8a43ad8064f7dd07e24fea5ccb40ce1ee7cb7586d41593b999aa277bb12729afce309e89f1bae141fa0dae7d72c9fd