diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-11-18 17:43:38 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-11-18 17:43:38 +0100 |
commit | 861a2748ecd6cd0ef7f0363598c1f1147e0d8139 (patch) | |
tree | 487731c4e10eb30b0c3d963cd0d983728c66a79a | |
parent | 9ea879911dacc69ef3f5bbdce54a6f0bff36478f (diff) | |
parent | 982abf7839815fa96040105d53ef5b5772c63424 (diff) | |
download | kernel-861a2748ecd6cd0ef7f0363598c1f1147e0d8139.tar.gz kernel-861a2748ecd6cd0ef7f0363598c1f1147e0d8139.tar.xz kernel-861a2748ecd6cd0ef7f0363598c1f1147e0d8139.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc5.20221118git84368d882b96.43.vanilla.1.fc38kernel-6.1.0-0.rc5.20221118git84368d882b96.43.vanilla.1.fc37kernel-6.1.0-0.rc5.20221118git84368d882b96.43.vanilla.1.fc36kernel-6.1.0-0.rc5.20221118git84368d882b96.43.vanilla.1.fc35
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rwxr-xr-x | kernel.spec | 10 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 645be0a98..3b8bbb40f 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 = 42 +RHEL_RELEASE = 43 # # ZSTREAM diff --git a/kernel.spec b/kernel.spec index 39f2a398b..13afaab66 100755 --- a/kernel.spec +++ b/kernel.spec @@ -127,13 +127,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.1.0 %define patchversion 6.1 -%define pkgrelease 0.rc5.20221117gitcc675d22e422.42 +%define pkgrelease 0.rc5.20221118git84368d882b96.43 %define kversion 6 -%define tarfile_release 6.1-rc5-44-gcc675d22e422 +%define tarfile_release 6.1-rc5-144-g84368d882b96 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20221117gitcc675d22e422.42%{?buildid}%{?dist} +%define specrelease 0.rc5.20221118git84368d882b96.43%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -3200,6 +3200,10 @@ fi # # %changelog +* Fri Nov 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc5.84368d882b96.43] +- redhat/Makefile: Fix RHJOBS grep warning (Prarit Bhargava) +- Linux v6.1.0-0.rc5.84368d882b96 + * Thu Nov 17 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc5.cc675d22e422.42] - redhat: Force remove tmp file (Prarit Bhargava) - redhat/configs: ALSA - cleanups for the CentOS 9.2 update (Jaroslav Kysela) @@ -1,3 +1,3 @@ -SHA512 (linux-6.1-rc5-44-gcc675d22e422.tar.xz) = 348ce400ae1ea7bfa264be5d2033e53e447be92115ecb7673e67a69d4fcfcd7251046d796b99709e25287e5b1527896eac493b68bf435eb071482babb1bf0304 -SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 71775394aa6f1d91ae1a08e66791c704cede554df62855a64169636b22f6a724504158be4c97e6d18d5e9cc088c8877e7d7512f6fd5538fac10cc5977bd6e906 -SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 14da554d325703d243f5713058b6796f3193bf2a17a12bac88decbbcfd41de21ae52fb5f238bf9c7175863831023ba0f7efc2b6d5d89341cfc2e3c95299c40f6 +SHA512 (linux-6.1-rc5-144-g84368d882b96.tar.xz) = accee273dc3e8ce04efbaa29e2000a31099c5cfacbb85eb977359d804736044ccdfbd1cc2ba5989f79d45daa978a6e8268e264cfd3ec23c066ab2f89e1b8fc3d +SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 24e123d812a40b0c814c82489d91073746d9526e38ba803916508520e93b3ebfca5b02203f83f51e5927a044bf20f25e0e6fdd7be6306c2a002f4cb98ec39585 +SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 30ed51ae48ee303dcf55ab20b3b89f7252c98755a124169b18c6e2d90005a4ec46bbe03793fae325b8f990c058e45dd54f7785ce303f44f096ed5466a187738f |