rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-5.18.0-0.rc7.54

Browse Source 
* Mon May 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc7.53]
- Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes)
- efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones)
- efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy)
- efi: libstub: declare DXE services table (Baskov Evgeniy)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-05-16 09:13:38 -05:00
parent 483a93c5de
commit f770443a3c
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
19 changed files with 57 additions and 32 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 = 51 RHEL_RELEASE = 54
# #
# ZSTREAM # ZSTREAM

12
Patchlist.changelog
View File

@ -1,11 +1,11 @@
"https://gitlab.com/cki-project/kernel-ark/-/commit"/d7f7a82ee0befeeedc638fdbdd933c6593658c4a "https://gitlab.com/cki-project/kernel-ark/-/commit"/4e0c59bd8192d21eabc92379652c91266e1ce221
d7f7a82ee0befeeedc638fdbdd933c6593658c4a efi: x86: Set the NX-compatibility flag in the PE header 4e0c59bd8192d21eabc92379652c91266e1ce221 efi: x86: Set the NX-compatibility flag in the PE header
"https://gitlab.com/cki-project/kernel-ark/-/commit"/8daa846d10413fc86310304cb8c1a11ccb8591e2 "https://gitlab.com/cki-project/kernel-ark/-/commit"/157c035f9a0f5930496e124f646acf3d3af54eff
8daa846d10413fc86310304cb8c1a11ccb8591e2 efi: libstub: ensure allocated memory to be executable 157c035f9a0f5930496e124f646acf3d3af54eff efi: libstub: ensure allocated memory to be executable
"https://gitlab.com/cki-project/kernel-ark/-/commit"/5501990e41ef21fa8fb34863d00798848d1cdd02 "https://gitlab.com/cki-project/kernel-ark/-/commit"/b53f8a4eb3206b09529c89e7738fa2671990c632
5501990e41ef21fa8fb34863d00798848d1cdd02 efi: libstub: declare DXE services table b53f8a4eb3206b09529c89e7738fa2671990c632 efi: libstub: declare DXE services table
"https://gitlab.com/cki-project/kernel-ark/-/commit"/a0c122c4fb17f350396cb664d2fc184df9872279 "https://gitlab.com/cki-project/kernel-ark/-/commit"/a0c122c4fb17f350396cb664d2fc184df9872279
a0c122c4fb17f350396cb664d2fc184df9872279 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed a0c122c4fb17f350396cb664d2fc184df9872279 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed

3
kernel-aarch64-debug-fedora.config
View File

@ -2894,7 +2894,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -3045,6 +3045,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y

3
kernel-aarch64-fedora.config
View File

@ -2878,7 +2878,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -3029,6 +3029,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y

4
kernel-armv7hl-debug-fedora.config
View File

@ -2908,7 +2908,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -3067,6 +3067,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3667,6 +3668,7 @@ CONFIG_LIVEPATCH=y
CONFIG_LLC=m CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

4
kernel-armv7hl-fedora.config
View File

@ -2893,7 +2893,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -3052,6 +3052,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3650,6 +3651,7 @@ CONFIG_LIVEPATCH=y
CONFIG_LLC=m CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

4
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -2853,7 +2853,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -3003,6 +3003,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3596,6 +3597,7 @@ CONFIG_LIVEPATCH=y
CONFIG_LLC=m CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

4
kernel-armv7hl-lpae-fedora.config
View File

@ -2838,7 +2838,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -2988,6 +2988,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3579,6 +3580,7 @@ CONFIG_LIVEPATCH=y
CONFIG_LLC=m CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

4
kernel-ppc64le-debug-fedora.config
View File

@ -2377,7 +2377,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -2503,6 +2503,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3053,6 +3054,7 @@ CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_PPC_KEYS=y CONFIG_LOAD_PPC_KEYS=y
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

4
kernel-ppc64le-fedora.config
View File

@ -2360,7 +2360,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -2486,6 +2486,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3034,6 +3035,7 @@ CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_PPC_KEYS=y CONFIG_LOAD_PPC_KEYS=y
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

4
kernel-s390x-debug-fedora.config
View File

@ -2356,7 +2356,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -2481,6 +2481,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3027,6 +3028,7 @@ CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_IPL_KEYS=y CONFIG_LOAD_IPL_KEYS=y
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

4
kernel-s390x-fedora.config
View File

@ -2339,7 +2339,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -2464,6 +2464,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3008,6 +3009,7 @@ CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_IPL_KEYS=y CONFIG_LOAD_IPL_KEYS=y
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

4
kernel-x86_64-debug-fedora.config
View File

@ -2572,7 +2572,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -2706,6 +2706,7 @@ CONFIG_INT3406_THERMAL=m
CONFIG_INT340X_THERMAL=m CONFIG_INT340X_THERMAL=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3329,6 +3330,7 @@ CONFIG_LIVEPATCH=y
CONFIG_LLC=m CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

2
kernel-x86_64-debug-rhel.config
View File

@ -2369,7 +2369,7 @@ CONFIG_INTEL_IOMMU=y
CONFIG_INTEL_IPS=m CONFIG_INTEL_IPS=m
# CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set
CONFIG_INTEL_ISH_HID=m CONFIG_INTEL_ISH_HID=m
# CONFIG_INTEL_ISHTP_ECLITE is not set CONFIG_INTEL_ISHTP_ECLITE=m
# CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_HDCP is not set
CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI=m

4
kernel-x86_64-fedora.config
View File

@ -2555,7 +2555,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DISABLE_HTABLE is not set
CONFIG_IMA_KEXEC=y CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -2689,6 +2689,7 @@ CONFIG_INT3406_THERMAL=m
CONFIG_INT340X_THERMAL=m CONFIG_INT340X_THERMAL=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y
@ -3310,6 +3311,7 @@ CONFIG_LIVEPATCH=y
CONFIG_LLC=m CONFIG_LLC=m
# CONFIG_LMK04832 is not set # CONFIG_LMK04832 is not set
CONFIG_LMP91000=m CONFIG_LMP91000=m
CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_BITS=16

2
kernel-x86_64-rhel.config
View File

@ -2353,7 +2353,7 @@ CONFIG_INTEL_IOMMU=y
CONFIG_INTEL_IPS=m CONFIG_INTEL_IPS=m
# CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set
CONFIG_INTEL_ISH_HID=m CONFIG_INTEL_ISH_HID=m
# CONFIG_INTEL_ISHTP_ECLITE is not set CONFIG_INTEL_ISHTP_ECLITE=m
# CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_HDCP is not set
CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI=m

17
kernel.spec
View File

@ -85,7 +85,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying # to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 0 %define debugbuildsenabled 1
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -129,13 +129,13 @@ Summary: The Linux kernel
%define specversion 5.18.0 %define specversion 5.18.0
%define patchversion 5.18 %define patchversion 5.18
%define pkgrelease 0.rc6.20220513gitf3f19f939c11925.51 %define pkgrelease 0.rc7.54
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 18 %define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc6.20220513gitf3f19f939c11925.51%{?buildid}%{?dist} %define specrelease 0.rc7.54%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -694,7 +694,7 @@ BuildRequires: lld
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.18-rc6-85-gf3f19f939c11925.tar.xz Source0: linux-5.18-rc7.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1386,8 +1386,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.18-rc6-85-gf3f19f939c11925 -c %setup -q -n kernel-5.18-rc7 -c
mv linux-5.18-rc6-85-gf3f19f939c11925 linux-%{KVERREL} mv linux-5.18-rc7 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -3029,12 +3029,15 @@ fi
# #
# #
%changelog %changelog
* Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.50] * Mon May 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc7.53]
- Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes) - Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes)
- efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones) - efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones)
- efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy) - efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy)
- efi: libstub: declare DXE services table (Baskov Evgeniy) - efi: libstub: declare DXE services table (Baskov Evgeniy)
* Mon May 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc7.52]
- redhat/configs: fix CONFIG_INTEL_ISHTP_ECLITE (David Arcari)
* Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.49] * Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.49]
- redhat/configs: Fix rm warning on error (Prarit Bhargava) - redhat/configs: Fix rm warning on error (Prarit Bhargava)
- Fix nightly merge CI (Don Zickus) - Fix nightly merge CI (Don Zickus)

2
patch-5.18-redhat.patch
View File

@ -129,7 +129,7 @@ index 000000000000..effb81d04bfd
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 2284d1ca2503..c8012c1fbc32 100644 index 5033c0577c6d..7038a9908a75 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.18-rc6-85-gf3f19f939c11925.tar.xz) = 5b7fca62feb2df28a9abd36aa9b9ce9ea6167c6167211c2d6799509cbbd444c4fe248738270733fd8b6db9f450a2e418f720537c8bbc3ca4123f684b8d3bec17 SHA512 (linux-5.18-rc7.tar.xz) = 9843bbe95485ee6569d5004902abafb5865ecf58eafd50ce760a5ba30829b32a826dd946af6134e4cbfebd241f3955379ca98a40fa1468bde554b4fa4a8445a9
SHA512 (kernel-abi-stablelists-5.18.0-0.rc6.20220513gitf3f19f939c11925.51.tar.bz2) = df122025ae6cfcf4b91937cb03cc9e20a58153ccdf17c74166fc5a15e803da5300fba2b5ece9235043e3965028dae5346932a41a858672c674407859bc2de8b1 SHA512 (kernel-abi-stablelists-5.18.0-0.rc7.54.tar.bz2) = 663015743054bf3c7e93bc206634378e4820cc79cc2c0fe519c613844cafe86ff30bc6429f6dd2fed3f50a5bd8576b95bf3bbb71a0bfe0363a39ea7cd31f0ebb
SHA512 (kernel-kabi-dw-5.18.0-0.rc6.20220513gitf3f19f939c11925.51.tar.bz2) = c0ae85291fb1fe5b38a657ee4cfdf0f8ad60f39fd56c82a78a47165b944e69226d042e95989e04a6b001637ad9dbb528a424884a24426119a61d116e93f133a9 SHA512 (kernel-kabi-dw-5.18.0-0.rc7.54.tar.bz2) = cc98e1a554cdcb3a09b61dd3ee8d3e7d1ac9b173eaecfe7204e87e3eed1c44ee9e17375918b690ba6a02b0aa6f9e90f6959123836a773678f8ee7a5e28ec34f6