diff --git a/Makefile.rhelver b/Makefile.rhelver index 8ceb9d970..939753a00 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 = 43 +RHEL_RELEASE = 45 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index cb864f89f..df5071cc3 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,11 @@ +* Wed Jun 26 2024 Justin M. Forbes [6.10.0-0.rc5.55027e689933.45] +- Linux v6.10.0-0.rc5.55027e689933 +Resolves: + +* Tue Jun 25 2024 Fedora Kernel Team [6.10.0-0.rc5.44] +- redhat: kernel.spec: add missing sound/soc/sof/sof-audio.h to kernel-devel package (Jaroslav Kysela) +Resolves: + * Mon Jun 24 2024 Justin M. Forbes [6.10.0-0.rc5.43] - redhat/kernel.spec: fix attributes of symvers file (Jan Stancek) - redhat: add filtermods rule for iommu tests (Jan Stancek) diff --git a/kernel.spec b/kernel.spec index 1eb515941..b2f1fb70f 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.43 +%define pkgrelease 0.rc5.20240626git55027e689933.45 %define kversion 6 -%define tarfile_release 6.10-rc5 +%define tarfile_release 6.10-rc5-18-g55027e689933 # 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.43%{?buildid}%{?dist} +%define specrelease 0.rc5.20240626git55027e689933.45%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -2439,6 +2439,8 @@ BuildKernel() { cp -a --parents arch/arm/include/asm/opcodes.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ %endif cp -a include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + # Cross-reference from include/perf/events/sof.h + cp -a sound/soc/sof/sof-audio.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/sound/soc/sof %ifarch i686 x86_64 # files for 'make prepare' to succeed with kernel-devel cp -a --parents arch/x86/entry/syscalls/syscall_32.tbl $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ @@ -4018,6 +4020,12 @@ fi\ # # %changelog +* Wed Jun 26 2024 Justin M. Forbes [6.10.0-0.rc5.55027e689933.45] +- Linux v6.10.0-0.rc5.55027e689933 + +* Tue Jun 25 2024 Fedora Kernel Team [6.10.0-0.rc5.44] +- redhat: kernel.spec: add missing sound/soc/sof/sof-audio.h to kernel-devel package (Jaroslav Kysela) + * Mon Jun 24 2024 Justin M. Forbes [6.10.0-0.rc5.43] - redhat/kernel.spec: fix attributes of symvers file (Jan Stancek) - redhat: add filtermods rule for iommu tests (Jan Stancek) diff --git a/sources b/sources index 1bbcfa527..6d83fb11b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.10-rc5.tar.xz) = bc10c509c8b1680b5f0c42c498f5d43374f8f254eaa3fb313b40d4ff711ccfecf9eb9f817f429268d4b4b1d67efd6aaca787311dc71e3221276803b9b76af25f -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 0fe01318dbb992c15b472d9166697f1901d628732337bbdeca315672545eb64c0a8ee2a32e5f8b70262e6f55bcf8061dee86bb329432d5f6a18c3f51dde8cf04 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = da4196de30b6fc6b267778112087583e063907b50e26bbaebb78a758e269776532a084b4e187564d8419d996ef64c1f789afe54c55a0155515da645ddb11efd1 +SHA512 (linux-6.10-rc5-18-g55027e689933.tar.xz) = cfa04d95c5a1c38b614a6196a20f9cde92547c6b1f215fe9bcb7e544d047c39a072801f71751649d49c667186bad046013e4b693d48ef67677dc38c92b4ad524 +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = e9896786ed33c36573d6646f773f26128ad6a67e5f27fe8b06f8aa5a314003bbe5dab5354bc928d3c4b41cc05b88d8865bbd505441e83256d8964f9c18950d53 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 8bac5e4668ba5dd4df8fecb6a99504cf91021b26d39139d7af6fee9dd069446ee49fa6159de55ecbd56580c5b792903648b31b988f390e04a13db571f2fe9af6