diff --git a/Makefile.rhelver b/Makefile.rhelver index 6645cf390..61c2648c5 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 = 46 +RHEL_RELEASE = 47 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 3d2c20dc4..e6b3e0055 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Fri Jun 28 2024 Fedora Kernel Team [6.10.0-0.rc5.5bbd9b249880.47] +- Linux v6.10.0-0.rc5.5bbd9b249880 +Resolves: + * Thu Jun 27 2024 Fedora Kernel Team [6.10.0-0.rc5.afcd48134c58.46] - redhat/scripts/filtermods.py: show all parent/child kmods in report (Jan Stancek) - redhat/kernel.spec: capture filtermods.py return code (Jan Stancek) diff --git a/kernel.spec b/kernel.spec index dfffeca71..3f775d263 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc5.20240627gitafcd48134c58.46 +%define pkgrelease 0.rc5.20240628git5bbd9b249880.47 %define kversion 6 -%define tarfile_release 6.10-rc5-35-gafcd48134c58 +%define tarfile_release 6.10-rc5-200-g5bbd9b249880 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20240627gitafcd48134c58.46%{?buildid}%{?dist} +%define specrelease 0.rc5.20240628git5bbd9b249880.47%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -4024,6 +4024,9 @@ fi\ # # %changelog +* Fri Jun 28 2024 Fedora Kernel Team [6.10.0-0.rc5.5bbd9b249880.47] +- Linux v6.10.0-0.rc5.5bbd9b249880 + * Thu Jun 27 2024 Fedora Kernel Team [6.10.0-0.rc5.afcd48134c58.46] - redhat/scripts/filtermods.py: show all parent/child kmods in report (Jan Stancek) - redhat/kernel.spec: capture filtermods.py return code (Jan Stancek) diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index 531e6aa69..cab33e32b 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -2400,7 +2400,7 @@ index 44488b1ab9a9..f76c91083b0f 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/module.h b/include/linux/module.h -index ffa1c603163c..efa06d882b54 100644 +index 330ffb59efe5..8a7c2ccbb4fa 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -418,6 +418,7 @@ struct module { diff --git a/sources b/sources index 5ba67150e..f85e88bfb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.10-rc5-35-gafcd48134c58.tar.xz) = a5040de6c4c07e307caeb1d68102d89ef98a6f646b5a1436eb9eaabcede5c9d10ee99210f739d03aa344d06ac8d96f5b960a2b1155d6f7bf9249c86cddc2daec -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = bd26dbc12e6ff215b4a65437f99ca66a74bf00bedcfaa76cb711ad30316ef243ecdc75b02d2a91693ce982737c66de0936b9d0a491a3bd77daad85a54fbf1e99 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 972888419620954cf77ec127b6e59cd5cf3d2bb1f31d593247cc253642450435d801526c6e3168cc3d08b6d1fd4a14ae927aa14209011ec4851aa42b32063ef5 +SHA512 (linux-6.10-rc5-200-g5bbd9b249880.tar.xz) = 8eafbebec3e739f124ec780e895b4c067ebef86b29b7917ebf3f879df79dcb8663f57199e6e3ab5c38698168af09e8f8ef3c922f157c7d792382614f142b0f69 +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 39dc35d04a363a1667ff15cfde9e422b23aadeb9969a8ee940832e320d5adde02ff14b9741e2d8f7827e45450ad15cbabcb7f0e03de9b5476617a5c81fb8d6a1 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = cbe89094fbb4c73376dc971c38d93aa66197c64f27cd92cd0e56fb7abb428f572999b91930c51290a33fc86821a899d86cec3a653e3ac4addcec96e5dd401618