rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

kernel-6.2.0-0.rc3.20230113gitd9fc1511728c.28

Browse Source 
* 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>
This commit is contained in:
Justin M. Forbes 2023-01-13 09:37:34 -06:00
parent 41958bfe40
commit 4b31e4ca50
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 27 RHEL_RELEASE = 28
# #
# ZSTREAM # ZSTREAM

3
Patchlist.changelog
View File

@ -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 "https://gitlab.com/cki-project/kernel-ark/-/commit"/77542637f2e84a847a7886979e0613332695c181
77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev 77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev

12
kernel.spec
View File

@ -126,13 +126,13 @@ Summary: The Linux kernel
# define buildid .local # define buildid .local
%define specversion 6.2.0 %define specversion 6.2.0
%define patchversion 6.2 %define patchversion 6.2
%define pkgrelease 0.rc3.20230112gite8f60cd7db24.27 %define pkgrelease 0.rc3.20230113gitd9fc1511728c.28
%define kversion 6 %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 # This is needed to do merge window version magic
%define patchlevel 2 %define patchlevel 2
# This allows pkg_release to have configurable %%{?dist} tag # 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 # This defines the kabi tarball version
%define kabiversion 6.2.0 %define kabiversion 6.2.0
@ -3179,9 +3179,13 @@ fi
# #
# #
%changelog %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) - 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] * 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 - Linux v6.2.0-0.rc3.e8f60cd7db24

4
patch-6.2-redhat.patch
View File

@ -2674,7 +2674,7 @@ index 463c9295bc28..9f4d0cefeceb 100644
/** /**
diff --git a/kernel/rh_messages.c b/kernel/rh_messages.c diff --git a/kernel/rh_messages.c b/kernel/rh_messages.c
new file mode 100644 new file mode 100644
index 000000000000..586c3319f530 index 000000000000..c55fb108c6bb
--- /dev/null --- /dev/null
+++ b/kernel/rh_messages.c +++ b/kernel/rh_messages.c
@@ -0,0 +1,209 @@ @@ -0,0 +1,209 @@
@ -2843,7 +2843,7 @@ index 000000000000..586c3319f530
+ if (msg) + if (msg)
+ str = msg; + str = msg;
+#ifdef CONFIG_MODULES +#ifdef CONFIG_MODULES
+ else if (mod && mod->name) + else if (mod)
+ str = mod->name; + str = mod->name;
+#endif +#endif
+ +

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.2-rc3-30-ge8f60cd7db24.tar.xz) = d1f7a409d39768bfce38685b335f6ef250aa1ae416d08eb20dd175c54174d8701409a87c011e2c03a1744b40ae8bb6b0b55f79e2f9c15792b8a96afaba004650 SHA512 (linux-6.2-rc3-165-gd9fc1511728c.tar.xz) = 5553af0b3461a0cb3d30cacbbe0f60103bd2cd0c1dd91f276ed86a3b625ccc5723582a54e7c698fc9ecaed7f2ae0d75a70c9c7fadd214a86daf9c8b31b3d6074
SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = ce1667eafa9286e665af07697f3b9038a5ea265fb96b0e235bdb076263fd412ae90a8e7296d01c9c920b4d6defdddbfe062e7b038a6ec72357eda7b0a8ec654f SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 972debd4a1064d132e2cf289bea7425d67bf977854649c473d0de384c0ce828a2fbaeb7d3f9695f8717cae41dbd3312f4582b5efd1c3396b6283d1c7221374e3
SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = a8aded6e40736382c401a119a43167cb3178675dee154e6637e1f2f7c656795d29179d83b101ba0d5fa2ef0bb303630924cd25fb43d325e18aadbd9fa5366bf1 SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 0b5a4b7644e03fe3e6517f990bd68d9549a897d33f3641db96dd1840acd6b43453e14e73e49f11b55b950d95de1e68d6da2187aabdc47da79bec51d02516aeff