diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-05 18:00:39 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-05 18:00:39 +0100 |
| commit | 91dc26d2db66dec449a162ff6b9e61daa8ad1a0a (patch) | |
| tree | 3bd7e3afd0eb01a1217737189e87546a0d40e38f | |
| parent | e69c83230089e4694f939433866899607d5dca4e (diff) | |
| parent | 83f75290fdd81e477aed7607e9819d1d38dc909a (diff) | |
| download | kernel-91dc26d2db66dec449a162ff6b9e61daa8ad1a0a.tar.gz kernel-91dc26d2db66dec449a162ff6b9e61daa8ad1a0a.tar.xz kernel-91dc26d2db66dec449a162ff6b9e61daa8ad1a0a.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc2.20230105git41c03ba9beea.20.vanilla.1.fc38kernel-6.2.0-0.rc2.20230105git41c03ba9beea.20.vanilla.1.fc37kernel-6.2.0-0.rc2.20230105git41c03ba9beea.20.vanilla.1.fc36
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | Patchlist.changelog | 4 | ||||
| -rwxr-xr-x | kernel.spec | 11 | ||||
| -rw-r--r-- | sources | 6 |
4 files changed, 13 insertions, 10 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 14cf4a794..573dc4027 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 = 19 +RHEL_RELEASE = 20 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 1dd3fa2c6..b9c5da732 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/37c79b27e6709bd6a3a6bfefb6b595cb3bbb0145 - 37c79b27e6709bd6a3a6bfefb6b595cb3bbb0145 Revert "arm64: remove special treatment for the link order of head.o" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/9d83406db5712041c5338f984a8f1adb7f8eaf4b + 9d83406db5712041c5338f984a8f1adb7f8eaf4b Revert "arm64: remove special treatment for the link order of head.o" "https://gitlab.com/cki-project/kernel-ark/-/commit"/77542637f2e84a847a7886979e0613332695c181 77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev diff --git a/kernel.spec b/kernel.spec index 7f1b86011..448ae89b1 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.rc2.20230103git69b41ac87e4a.19 +%define pkgrelease 0.rc2.20230105git41c03ba9beea.20 %define kversion 6 -%define tarfile_release 6.2-rc2-10-g69b41ac87e4a +%define tarfile_release 6.2-rc2-57-g41c03ba9beea # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20230103git69b41ac87e4a.19%{?buildid}%{?dist} +%define specrelease 0.rc2.20230105git41c03ba9beea.20%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3188,10 +3188,13 @@ fi # # %changelog -* Tue Jan 03 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.69b41ac87e4a.19] +* Thu Jan 05 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.41c03ba9beea.20] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) - Revert "arm64: remove special treatment for the link order of head.o" (Justin M. Forbes) +* Thu Jan 05 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.41c03ba9beea.19] +- Linux v6.2.0-0.rc2.41c03ba9beea + * Tue Jan 03 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.69b41ac87e4a.18] - redhat/docs: Add FAQ entry for booting between Fedora & ELN/RHEL kernels (Prarit Bhargava) - Linux v6.2.0-0.rc2.69b41ac87e4a @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc2-10-g69b41ac87e4a.tar.xz) = 24c017ef7b5d8994382a2b7ab2a69fe3f6912748a954f95bda2d153568f9ba03edf366313c9009edbd626e29a84721778b5ea35cd9bff107e2b0ae14d57d274e -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = ed2cdf3955db009d95f7a83f9b985d59b03b8d92e95cd36f8825fe7a9369c1d787adb566b6a63323170081e2757fdc274c23e2a18230632f8a4c49611f468198 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 0767fa13cadfabfefb0c7443196ba19c7fd66b1609b7da7f20cb16bc8c567cd4984cf50e08cde16faa0a1d6dbbe3c3a22619edc07471cdf1f26c4d843b332a00 +SHA512 (linux-6.2-rc2-57-g41c03ba9beea.tar.xz) = b155e04f41d598039ac2d710be4fa7282c316932a8eedf8e609c145431ab0c144cb5d7b36d0256d48a36a7b13cf754183520173c9a4f5df9861d5a6b50e6008b +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 8a00e185f5cdf2571048c1ae4d07a888079bd39ae8108d1b66e6dff95bb794c72d40a61273d3c0d137135ca800722a7615a1f64cc8783c00ad35e2b0eeab0633 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = f1309b54da3dea7c1d6a533d3d7819f654bdd5938ccdf297788109de2d5ba8a7ddc300e0935252ec5e6b56426033a57c9ef07fb05cbb9a8c8fb4324504982476 |