diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2023-01-13 09:37:34 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2023-01-13 09:37:34 -0600 |
| commit | 4b31e4ca501d98b7c9c84b920a66a911b89a2e49 (patch) | |
| tree | 60c75dbe7b2ed0b6151e4397c1f73497194b45d1 | |
| parent | 41958bfe4075a168f626a7215e2f57a726c1a3c6 (diff) | |
| download | kernel-4b31e4ca501d98b7c9c84b920a66a911b89a2e49.tar.gz kernel-4b31e4ca501d98b7c9c84b920a66a911b89a2e49.tar.xz kernel-4b31e4ca501d98b7c9c84b920a66a911b89a2e49.zip | |
kernel-6.2.0-0.rc3.20230113gitd9fc1511728c.28
* Fri Jan 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.d9fc1511728c.28]
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
Resolves:
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | Patchlist.changelog | 3 | ||||
| -rwxr-xr-x | kernel.spec | 12 | ||||
| -rw-r--r-- | patch-6.2-redhat.patch | 4 | ||||
| -rw-r--r-- | sources | 6 |
5 files changed, 17 insertions, 10 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index a985bc34f..25620a326 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 = 27 +RHEL_RELEASE = 28 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index f169f7c03..d0c7ee503 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/1c4eac94136bf04ed3def1a58778e728be3c19dd + 1c4eac94136bf04ed3def1a58778e728be3c19dd kernel/rh_messages.c: gcc12 warning on redundant NULL test + "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 20bf6c2c5..64ebb81ef 100755 --- a/kernel.spec +++ b/kernel.spec @@ -126,13 +126,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc3.20230112gite8f60cd7db24.27 +%define pkgrelease 0.rc3.20230113gitd9fc1511728c.28 %define kversion 6 -%define tarfile_release 6.2-rc3-30-ge8f60cd7db24 +%define tarfile_release 6.2-rc3-165-gd9fc1511728c # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20230112gite8f60cd7db24.27%{?buildid}%{?dist} +%define specrelease 0.rc3.20230113gitd9fc1511728c.28%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3179,9 +3179,13 @@ fi # # %changelog -* Thu Jan 12 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.e8f60cd7db24.27] +* Fri Jan 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.d9fc1511728c.28] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) +* Fri Jan 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.d9fc1511728c.27] +- kernel/rh_messages.c: gcc12 warning on redundant NULL test (Eric Chanudet) [2142658] +- Linux v6.2.0-0.rc3.d9fc1511728c + * Thu Jan 12 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.e8f60cd7db24.26] - Linux v6.2.0-0.rc3.e8f60cd7db24 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index f708b688c..f2c373a42 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -2674,7 +2674,7 @@ index 463c9295bc28..9f4d0cefeceb 100644 /** diff --git a/kernel/rh_messages.c b/kernel/rh_messages.c new file mode 100644 -index 000000000000..586c3319f530 +index 000000000000..c55fb108c6bb --- /dev/null +++ b/kernel/rh_messages.c @@ -0,0 +1,209 @@ @@ -2843,7 +2843,7 @@ index 000000000000..586c3319f530 + if (msg) + str = msg; +#ifdef CONFIG_MODULES -+ else if (mod && mod->name) ++ else if (mod) + str = mod->name; +#endif + @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc3-30-ge8f60cd7db24.tar.xz) = d1f7a409d39768bfce38685b335f6ef250aa1ae416d08eb20dd175c54174d8701409a87c011e2c03a1744b40ae8bb6b0b55f79e2f9c15792b8a96afaba004650 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = ce1667eafa9286e665af07697f3b9038a5ea265fb96b0e235bdb076263fd412ae90a8e7296d01c9c920b4d6defdddbfe062e7b038a6ec72357eda7b0a8ec654f -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = a8aded6e40736382c401a119a43167cb3178675dee154e6637e1f2f7c656795d29179d83b101ba0d5fa2ef0bb303630924cd25fb43d325e18aadbd9fa5366bf1 +SHA512 (linux-6.2-rc3-165-gd9fc1511728c.tar.xz) = 5553af0b3461a0cb3d30cacbbe0f60103bd2cd0c1dd91f276ed86a3b625ccc5723582a54e7c698fc9ecaed7f2ae0d75a70c9c7fadd214a86daf9c8b31b3d6074 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 972debd4a1064d132e2cf289bea7425d67bf977854649c473d0de384c0ce828a2fbaeb7d3f9695f8717cae41dbd3312f4582b5efd1c3396b6283d1c7221374e3 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 0b5a4b7644e03fe3e6517f990bd68d9549a897d33f3641db96dd1840acd6b43453e14e73e49f11b55b950d95de1e68d6da2187aabdc47da79bec51d02516aeff |