diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-12-30 08:12:55 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-12-30 08:12:55 -0600 |
| commit | 90ce4749d5a8f57865d69a1d04766619d6da5484 (patch) | |
| tree | f7c8f105e5a9d92fa38f9794ac24046f954c7485 | |
| parent | 033e511447ba8abd5e93ec3c0e2c177139466843 (diff) | |
| download | kernel-90ce4749d5a8f57865d69a1d04766619d6da5484.tar.gz kernel-90ce4749d5a8f57865d69a1d04766619d6da5484.tar.xz kernel-90ce4749d5a8f57865d69a1d04766619d6da5484.zip | |
kernel-6.2.0-0.rc1.20221230gitbff687b3dad6.15
* Fri Dec 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.bff687b3dad6.15]
- 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)
Resolves:
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | Patchlist.changelog | 4 | ||||
| -rwxr-xr-x | kernel.spec | 13 | ||||
| -rw-r--r-- | patch-6.2-redhat.patch | 4 | ||||
| -rw-r--r-- | sources | 6 |
5 files changed, 16 insertions, 13 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 5e65c2fc9..39d4dc1fe 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 = 14 +RHEL_RELEASE = 15 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 5b5a58ca5..1c694f17b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ab7b4e0cd7bf09cc20db4ba66092ffe222271a26 - ab7b4e0cd7bf09cc20db4ba66092ffe222271a26 Revert "arm64: remove special treatment for the link order of head.o" +"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"/77542637f2e84a847a7886979e0613332695c181 77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev diff --git a/kernel.spec b/kernel.spec index cb6fb9c44..d0e7a797a 100755 --- a/kernel.spec +++ b/kernel.spec @@ -122,17 +122,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc1.14 +%define pkgrelease 0.rc1.20221230gitbff687b3dad6.15 %define kversion 6 -%define tarfile_release 6.2-rc1 +%define tarfile_release 6.2-rc1-68-gbff687b3dad6 # 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.14%{?buildid}%{?dist} +%define specrelease 0.rc1.20221230gitbff687b3dad6.15%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3179,10 +3179,13 @@ fi # # %changelog -* Mon Dec 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.14] +* Fri Dec 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.bff687b3dad6.15] - 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) +* 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 + * Mon Dec 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.13] - Linux v6.2.0-0.rc1 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index ba27174c3..8f14182f4 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -1229,7 +1229,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 95c488ea91c3..fad3f16d463f 100644 +index 7be562a4e1aa..0169d9f5df9b 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1343,7 +1343,7 @@ index c03093b6813c..46a71df1fbd1 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 6bbb73ef8b25..1c99a8a525c9 100644 +index 424c8a467a0c..3230b91d3476 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -873,6 +873,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc1.tar.xz) = 080f41abfb1d1f758a4bc1ccf1bb95b74da1f294ba53ff94bd72d66768f2430825fe54cd8fa5c4378d1d50d9386a01ca3fed87d49ec2f6e7573d9ac51861e925 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 62cae4b30ae5126468a1975f99339107a48e267a40e0daac09e6d0fe3c9fae23d1388e249a5c9666bc737269426f0ea3049391438237ce2c423859b0287c7e09 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = b5e60bbae21bfa4f1057611f933b76a56a68ed2880985216648fdf863b72da82e016a4c01e66c4fe6262eed026b05dfa88bf818b4927c64ae90d3f5e4907136c +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 |