diff --git a/Makefile.rhelver b/Makefile.rhelver index 913f12fc1..7fa8416f1 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 = 55 +RHEL_RELEASE = 58 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 67b8eeb6f..f8c991d0e 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,19 @@ -* Fri Jul 05 2024 Fedora Kernel Team [6.10.0-0.rc6.661e504db04c.55] +* Mon Jul 08 2024 Fedora Kernel Team [6.10.0-0.rc7.58] - Add openssl-devel-engine as a buildrequirement. (Justin M. Forbes) Resolves: +* Mon Jul 08 2024 Fedora Kernel Team [6.10.0-0.rc7.57] +- Linux v6.10.0-0.rc7 +Resolves: + +* Sun Jul 07 2024 Fedora Kernel Team [6.10.0-0.rc6.c6653f49e4fd.56] +- Linux v6.10.0-0.rc6.c6653f49e4fd +Resolves: + +* Sat Jul 06 2024 Fedora Kernel Team [6.10.0-0.rc6.1dd28064d416.55] +- Linux v6.10.0-0.rc6.1dd28064d416 +Resolves: + * Fri Jul 05 2024 Fedora Kernel Team [6.10.0-0.rc6.661e504db04c.54] - Linux v6.10.0-0.rc6.661e504db04c Resolves: diff --git a/kernel.spec b/kernel.spec index 80c6192bb..b1d4c675f 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.rc6.20240705git661e504db04c.55 +%define pkgrelease 0.rc7.58 %define kversion 6 -%define tarfile_release 6.10-rc6-163-g661e504db04c +%define tarfile_release 6.10-rc7 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240705git661e504db04c.55%{?buildid}%{?dist} +%define specrelease 0.rc7.58%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -4043,9 +4043,18 @@ fi\ # # %changelog -* Fri Jul 05 2024 Fedora Kernel Team [6.10.0-0.rc6.661e504db04c.55] +* Mon Jul 08 2024 Fedora Kernel Team [6.10.0-0.rc7.58] - Add openssl-devel-engine as a buildrequirement. (Justin M. Forbes) +* Mon Jul 08 2024 Fedora Kernel Team [6.10.0-0.rc7.57] +- Linux v6.10.0-0.rc7 + +* Sun Jul 07 2024 Fedora Kernel Team [6.10.0-0.rc6.c6653f49e4fd.56] +- Linux v6.10.0-0.rc6.c6653f49e4fd + +* Sat Jul 06 2024 Fedora Kernel Team [6.10.0-0.rc6.1dd28064d416.55] +- Linux v6.10.0-0.rc6.1dd28064d416 + * Fri Jul 05 2024 Fedora Kernel Team [6.10.0-0.rc6.661e504db04c.54] - Linux v6.10.0-0.rc6.661e504db04c diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index 0a9518bdf..1b27ff80d 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -139,7 +139,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 06aa6402b385..d4ded90a4b63 100644 +index b25b5b44af10..57f5aed0475a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 70cc54cc2..86e50d33f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.10-rc6-163-g661e504db04c.tar.xz) = 2c8e773ad590fdc776a132aef286587aae08044f56e8acadf3c936e167fc5c6c62d15416d3d4d1d08eb0626032b7281c0a340b7f98c9b6e8209125be2f356e5d -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 7ec4d53e4bfbc66f89dffeb536c1e4dc707f581a6041b8fa61865265edb13dc89b5a86e2a00ca080407862afb2687272212dba495694763dba7b47ed1904264b -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 0a245b524785eb6bc8655f29bc5e5ea72b8a5451356bc8d2450c148aa74d0618f2c9db1a5893a4ea19b429ce9889897955ade296cc96d577238dee364c32c74f +SHA512 (linux-6.10-rc7.tar.xz) = e6d977770470be4344dc06cee1f163035f6adf658f1bad491bbce2dcf45e5e3fa2d419c73c873392cb6b520ae2afa73715ee2237251235cee90235092e59e6cf +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 0364a05e5b1fef92f9d1bf67b1c1b3388e0cad5e1669c6a05484c8d67cff9d8511b78a694eba906d767c327cec6c34cc1fe9faff2d38e228d1a40402fc698488 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 503efa109c986131ce918ea62746923718c8371501610778dfa0f0ac6b265ff07a6466cbe784e0e8168fa9ce14be4b448ed49abfef7d81c711c87b2e325dcf70