diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-26 18:23:02 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-26 18:23:02 +0100 |
commit | aa0cc31186b196efd9953fd94aee4f9433e2755d (patch) | |
tree | 9289773682e70dee3c39729a59dab37d3a1974a7 | |
parent | 6cada51103466a44e30e46a9578cf2cccb96f547 (diff) | |
parent | c2d86c229c140f568f1c569ab5d5125978ad19a6 (diff) | |
download | kernel-aa0cc31186b196efd9953fd94aee4f9433e2755d.tar.gz kernel-aa0cc31186b196efd9953fd94aee4f9433e2755d.tar.xz kernel-aa0cc31186b196efd9953fd94aee4f9433e2755d.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc5.20230126git7c46948a6e9c.41.vanilla.1.fc38kernel-6.2.0-0.rc5.20230126git7c46948a6e9c.41.vanilla.1.fc37kernel-6.2.0-0.rc5.20230126git7c46948a6e9c.41.vanilla.1.fc36
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rwxr-xr-x | kernel.spec | 16 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 16 insertions, 8 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 679b748aa..616f1636b 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 = 40 +RHEL_RELEASE = 41 # # ZSTREAM diff --git a/kernel.spec b/kernel.spec index ad4afa8ec..094704e52 100755 --- a/kernel.spec +++ b/kernel.spec @@ -130,13 +130,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc5.20230125git948ef7bb70c4.40 +%define pkgrelease 0.rc5.20230126git7c46948a6e9c.41 %define kversion 6 -%define tarfile_release 6.2-rc5-45-g948ef7bb70c4 +%define tarfile_release 6.2-rc5-47-g7c46948a6e9c # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20230125git948ef7bb70c4.40%{?buildid}%{?dist} +%define specrelease 0.rc5.20230126git7c46948a6e9c.41%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3229,11 +3229,19 @@ fi # # %changelog -* Wed Jan 25 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.948ef7bb70c4.40] +* Thu Jan 26 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.7c46948a6e9c.41] - Turn on debug builds for aarch64 Fedora (Justin M. Forbes) - Turn off forced debug builds (Justin M. Forbes) - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) +* Thu Jan 26 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.7c46948a6e9c.40] +- redhat/self-test: Update data with ENABLE_WERROR (Prarit Bhargava) +- redhat/Makefile.variables: Add ENABLE_WERROR (Prarit Bhargava) +- makefile: Add -Werror support for RHEL (Prarit Bhargava) +- redhat/Makefile.variables: Remove mention of Makefile.rhpkg (Prarit Bhargava) +- redhat/Makefile.variables: Alphabetize variables (Prarit Bhargava) +- Linux v6.2.0-0.rc5.7c46948a6e9c + * Wed Jan 25 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.948ef7bb70c4.39] - gitlab-ci: use CI templates from production branch (Michael Hofmann) - Linux v6.2.0-0.rc5.948ef7bb70c4 @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc5-45-g948ef7bb70c4.tar.xz) = ef42828dccd9ac9696e0eb3aebed2df875f2e284f202ac14d6e46e06c1a4b399bed62d9101a0f95467fdfb1cab49e74ee51f699a89f48f7f26f6f3daeb329977 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 2927b058a64ec0c81636ba46dbd75f61bd0a3ef1fc36973df36dbf58e73d190fcd36b7d0b817d3f14b0379c7d81136a4078c6bf54dbde12951c83ba32f326e14 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 27a27d06292b211c68ca727a9bee231bd856cdc67d5b19784bcae7dfb8647ee485b447c99cb34cb7b74a082b8ea040066142faec79cc4c74eddb4331ce2daeb7 +SHA512 (linux-6.2-rc5-47-g7c46948a6e9c.tar.xz) = 7dee089cfe92d517d9981e72cdb12f62552a92f7a6ee50638064128802380ce6b814dfe57ce6525c1074382de16c8e5c8b3da89d53a8db338795b99ff71b06d4 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = f59593f441a10fa0683242a924a614e9d6b14dbaf9b9a9bf7ebfcd0359342e2ef141453916926debfa1b0f47800460de6d323c5d0464e4fee241a656de84b176 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = d33a5521deec9faa274fd99bd0ff909eea16cb041d2762b031607955c580a81b505189c7dd0e95bdd61f180927850442ba827a103e8189737aa24ae34d46ef67 |