diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-08-19 17:41:11 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-08-19 17:41:11 +0200 |
commit | ae7267d14d9f88ae47a710ed1ee3639e8385a221 (patch) | |
tree | 39a1a9bad4fb7d3c898597297a0c49362bd33392 | |
parent | 10b29a7792dd284f9c4ecc8daefacce0e505064e (diff) | |
parent | 904abaf70b2c6d56b0cea8bddb3653f8f666c868 (diff) | |
download | kernel-ae7267d14d9f88ae47a710ed1ee3639e8385a221.tar.gz kernel-ae7267d14d9f88ae47a710ed1ee3639e8385a221.tar.xz kernel-ae7267d14d9f88ae47a710ed1ee3639e8385a221.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-0.rc1.20220819git4c2d0b039c5c.16.vanilla.1.fc38kernel-6.0.0-0.rc1.20220819git4c2d0b039c5c.16.vanilla.1.fc37kernel-6.0.0-0.rc1.20220819git4c2d0b039c5c.16.vanilla.1.fc36kernel-6.0.0-0.rc1.20220819git4c2d0b039c5c.16.vanilla.1.fc35
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rwxr-xr-x | kernel.spec | 6 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 39d4dc1fe..6f3deb6db 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 = 15 +RHEL_RELEASE = 16 # # ZSTREAM diff --git a/kernel.spec b/kernel.spec index 7f62db494..a99c4a047 100755 --- a/kernel.spec +++ b/kernel.spec @@ -128,13 +128,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.0.0 %define patchversion 6.0 -%define pkgrelease 0.rc1.20220818git3b06a2755758.15 +%define pkgrelease 0.rc1.20220819git4c2d0b039c5c.16 %define kversion 6 -%define tarfile_release 6.0-rc1-66-g3b06a2755758 +%define tarfile_release 6.0-rc1-160-g4c2d0b039c5c # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20220818git3b06a2755758.15%{?buildid}%{?dist} +%define specrelease 0.rc1.20220819git4c2d0b039c5c.16%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.0.0 @@ -1,3 +1,3 @@ -SHA512 (linux-6.0-rc1-66-g3b06a2755758.tar.xz) = bdec676b4023cd62e8a349dd2cc123ba1e10950199794b4578095d8aca24b9b889ee803b0d09656bbae775946d011c014b9eb38569cae003649075c6a52d0cef -SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = e11496f37111b3b1df42929ded0a01390db8d8d5a149ec70edb97c2a361083ed2d60bc2505aa4772ccd457cec51c1733220ba202718cdc8071c3dbaeb922ed00 -SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 593149b46c228257570e42c7898eab038ec447f020ec78383b397621579f2181b40cafba07690f60bf529568eab66092d81ab9180ef469983b5ac17736e173ab +SHA512 (linux-6.0-rc1-160-g4c2d0b039c5c.tar.xz) = bf70a7fce8a5153ce69630ea14309c24370ffc4e8715ed1bc7e846318178340bb2c4c4f3303f915122fd4da7ca61e08bfd46541d9b463f46d134977a83df7426 +SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = f3f6a2008e4af908736cb2a34e85e54270b64c23c186c7ce7de88ed3b4bf2428c7343237cf0900a449bae4058584ebbe1542bdbe32c819eee90663dda76b96de +SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 37965343657b0a0cef9a0f018f1ed8450190fd26f8ec78d78be8a1a754c9d4eeb09d8b2d556cd64f2e1a694776b5a9ea86f80a43ba4f2f44bc2521d0e1a7e778 |