diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-02 15:53:51 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-02 15:53:51 +0100 |
| commit | 314798650372adc63b910e045202fe11dc2f9c5b (patch) | |
| tree | 6bd9e5afbd8c97b00b55bf7cbc620a604c56ee9a | |
| parent | 05f106b9e2eedbe1875bd5d9653eddc5adbc7a2b (diff) | |
| parent | 549ce1657c7c9d931584267553d6330ad87cfa28 (diff) | |
| download | kernel-314798650372adc63b910e045202fe11dc2f9c5b.tar.gz kernel-314798650372adc63b910e045202fe11dc2f9c5b.tar.xz kernel-314798650372adc63b910e045202fe11dc2f9c5b.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | Patchlist.changelog | 4 | ||||
| -rwxr-xr-x | kernel.spec | 17 | ||||
| -rw-r--r-- | patch-6.2-redhat.patch | 2 | ||||
| -rw-r--r-- | sources | 6 |
5 files changed, 20 insertions, 11 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 39d4dc1fe..92aed85ff 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 = 18 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 1c694f17b..a786deacf 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/31440cec143449a0901c418d13ec9dbdd61ab8ce - 31440cec143449a0901c418d13ec9dbdd61ab8ce Revert "arm64: remove special treatment for the link order of head.o" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/32d9751fdfeabc800ecc776d020a5aa11c53b17b + 32d9751fdfeabc800ecc776d020a5aa11c53b17b 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 b43f6e5c8..83bde0da8 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.rc1.20221230gitbff687b3dad6.15 +%define pkgrelease 0.rc2.18 %define kversion 6 -%define tarfile_release 6.2-rc1-68-gbff687b3dad6 +%define tarfile_release 6.2-rc2 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20221230gitbff687b3dad6.15%{?buildid}%{?dist} +%define specrelease 0.rc2.18%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3192,10 +3192,19 @@ fi # # %changelog -* Fri Dec 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.bff687b3dad6.15] +* Mon Jan 02 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.18] - 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) +* Mon Jan 02 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.17] +- Linux v6.2.0-0.rc2 + +* Sun Jan 01 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.e4cf7c25bae5.16] +- Linux v6.2.0-0.rc1.e4cf7c25bae5 + +* Sat Dec 31 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.c8451c141e07.15] +- Linux v6.2.0-0.rc1.c8451c141e07 + * Fri Dec 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.bff687b3dad6.14] - Linux v6.2.0-0.rc1.bff687b3dad6 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 8f14182f4..3d51de1e8 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index d4b6af8c09e9..8223bfdea30b 100644 +index c05b4fb7121e..3f787bf5207e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc1-68-gbff687b3dad6.tar.xz) = dbbe474460e7dbfc6962c9dbe73da394f36240a466d4b6bd9f3c56e08618296799dfe1588bac7d9c57f6acca67f5ca2d6950cb5e41bc3cc1c476ceffe6b60770 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = b3d53f00e63f466f07c2e0bf512a9e53b6f1cfc8263da5272993cfbda1888f0a10256d6fa15f3ae43f25a5bd597f7416dd13e9f43d7fface92c9e6e3d33b3c89 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 52c2023b26d20452be4b915f5c6100db648da467d780f16dc4b4f332706eb3dcd001f3c0f50cdb80315c8674c753afc938b51287c56f2f0b19f11310570fa8c0 +SHA512 (linux-6.2-rc2.tar.xz) = 37b597cd05b0c83fdca124630d61984509a32b0900db9225495c4ebf1f5920dbd2d6dbefded3f669137e31ffbe03d670d1b5dbaeb2f93ddd714ed72a8d34b783 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = b0c710566ecddf3baa33a5f75ca866beee9000b42866f78b699b64f502a4d251d98def445350759de78f88610110619bb653aae1300dcae5a7c03f358dc985d2 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 7aa2f21a1aa77938d8655f9802d8d368330767b9a63684663a4d86b4d6f909a3321fb73015abea9cecd79ae74e6cc9fa557b45303d609b2ae0b0e4777c5f85db |