diff --git a/Makefile.rhelver b/Makefile.rhelver index 3606a7785..cb2beaa85 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 = 12 +RHEL_RELEASE = 17 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 935081c4a..98ae4bda5 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/7ba2fc7e001181fe630e92a4633e76a6c71689e1 + 7ba2fc7e001181fe630e92a4633e76a6c71689e1 scsi: sd: Add "probe_type" module parameter to allow synchronous probing + "https://gitlab.com/cki-project/kernel-ark/-/commit"/4b35b89927d7bc634917f603ffc1bcccbdca2f15 4b35b89927d7bc634917f603ffc1bcccbdca2f15 Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64" diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 9d43063ff..14a9ff157 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2527,7 +2527,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2672,7 +2672,8 @@ CONFIG_INPUT=y # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 95f9c8807..70a42131e 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2511,7 +2511,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2656,7 +2656,8 @@ CONFIG_INPUT=y # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 753c66b35..5502232b7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3133,7 +3133,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -3295,7 +3295,8 @@ CONFIG_INPUT=y # CONFIG_INPUT_YEALINK is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -8977,6 +8978,7 @@ CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -9388,7 +9390,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index cb9881069..4d0b81a9a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2523,7 +2523,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2668,7 +2668,8 @@ CONFIG_INPUT=y # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 7458cba00..538a113bd 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3116,7 +3116,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -3278,7 +3278,8 @@ CONFIG_INPUT=y # CONFIG_INPUT_YEALINK is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -8948,6 +8949,7 @@ CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -9359,7 +9361,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 2d438e568..8cd2d03ff 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2507,7 +2507,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2652,7 +2652,8 @@ CONFIG_INPUT=y # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index ee72b856a..98ac8f9d2 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -2613,7 +2613,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2758,7 +2758,8 @@ CONFIG_INPUT=y # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 9ceaa1f90..f0c3f33da 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -2597,7 +2597,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2742,7 +2742,8 @@ CONFIG_INPUT=y # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index e4d974566..bbdb885ec 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -3092,7 +3092,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -3260,7 +3260,8 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -9002,6 +9003,7 @@ CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -9439,7 +9441,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8685a2df3..71c8f9da7 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -3076,7 +3076,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -3244,7 +3244,8 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -8975,6 +8976,7 @@ CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -9412,7 +9414,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 4d5d6b262..2b4c41ff3 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -3037,7 +3037,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -3196,7 +3196,8 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -8766,6 +8767,7 @@ CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -9190,7 +9192,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 12ba4967d..0e827f678 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -3021,7 +3021,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -3180,7 +3180,8 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -8739,6 +8740,7 @@ CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -9163,7 +9165,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index e473a1968..0328463a9 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2532,7 +2532,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2664,7 +2664,8 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -7520,6 +7521,7 @@ CONFIG_USB_XHCI_PCI=y CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -7886,7 +7888,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 7bc794f54..c721b067b 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2265,7 +2265,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2391,7 +2391,8 @@ CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d08503759..85307ce10 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2512,7 +2512,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2644,7 +2644,8 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -7489,6 +7490,7 @@ CONFIG_USB_XHCI_PCI=y CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -7855,7 +7857,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 7c919432f..1ccecd515 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2249,7 +2249,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2375,7 +2375,8 @@ CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 49d66841b..94f2fc410 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2511,7 +2511,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2642,7 +2642,8 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -7465,6 +7466,7 @@ CONFIG_USB_XHCI_PCI=y CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -7835,7 +7837,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 6f79d653b..b6a2055e0 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2252,7 +2252,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2377,7 +2377,8 @@ CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 01bfd0a35..30bb67720 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2491,7 +2491,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2622,7 +2622,8 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -7434,6 +7435,7 @@ CONFIG_USB_XHCI_PCI=y CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -7804,7 +7806,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index b6e5cb3f7..9e08d08af 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2236,7 +2236,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2361,7 +2361,8 @@ CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 08bbced8c..37b782d3f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2246,7 +2246,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2372,7 +2372,8 @@ CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set # CONFIG_INTEGRITY_ASYMMETRIC_KEYS is not set CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y # CONFIG_INTEGRITY_PLATFORM_KEYRING is not set # CONFIG_INTEGRITY_SIGNATURE is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 7ad6f614f..de6e75e50 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2739,7 +2739,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2879,7 +2879,8 @@ CONFIG_INT3406_THERMAL=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -7942,6 +7943,7 @@ CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -8322,7 +8324,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index aec8ee23a..4e6d9daf2 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2397,7 +2397,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2528,7 +2528,8 @@ CONFIG_INPUT_YEALINK=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index ce6359576..e74320795 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2719,7 +2719,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2859,7 +2859,8 @@ CONFIG_INT3406_THERMAL=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y @@ -7912,6 +7913,7 @@ CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XUSBATM=m CONFIG_USB=y CONFIG_USB_YUREX=m +# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ZR364XX=m # CONFIG_USELIB is not set @@ -8292,7 +8294,7 @@ CONFIG_WLAN_VENDOR_RSI=y # CONFIG_WLAN_VENDOR_SILABS is not set CONFIG_WLAN_VENDOR_ST=y CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WLAN_VENDOR_ZYDAS is not set +CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_WLAN=y CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 3913ae59c..408954b4e 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2381,7 +2381,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2512,7 +2512,8 @@ CONFIG_INPUT_YEALINK=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 062ded1ea..26a308d43 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -2488,7 +2488,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2619,7 +2619,8 @@ CONFIG_INPUT_YEALINK=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index f54327eba..676ee6275 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -2472,7 +2472,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2603,7 +2603,8 @@ CONFIG_INPUT_YEALINK=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set +CONFIG_INTEGRITY_CA_MACHINE_KEYRING_MAX=y +CONFIG_INTEGRITY_CA_MACHINE_KEYRING=y CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y diff --git a/kernel.spec b/kernel.spec index de1ea0b07..0136f2e17 100644 --- a/kernel.spec +++ b/kernel.spec @@ -174,13 +174,13 @@ Summary: The Linux kernel %define specrpmversion 6.5.0 %define specversion 6.5.0 %define patchversion 6.5 -%define pkgrelease 0.rc1.20230711git3f01e9fed845.12 +%define pkgrelease 0.rc2.17 %define kversion 6 -%define tarfile_release 6.5-rc1-6-g3f01e9fed845 +%define tarfile_release 6.5-rc2 # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20230711git3f01e9fed845.12%{?buildid}%{?dist} +%define specrelease 0.rc2.17%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -3732,6 +3732,29 @@ fi\ # # %changelog +* Mon Jul 17 2023 Fedora Kernel Team [6.5.0-0.rc2.17.el127] +- Linux v6.5.0-0.rc2 + +* Sun Jul 16 2023 Fedora Kernel Team [6.5.0-0.rc1.831fe284d827.16.el127] +- fedora: wifi: tweak ZYDAS WiFI config options (Peter Robinson) +- Linux v6.5.0-0.rc1.831fe284d827 + +* Sat Jul 15 2023 Fedora Kernel Team [6.5.0-0.rc1.b6e6cc1f78c7.15.el127] +- scsi: sd: Add "probe_type" module parameter to allow synchronous probing (Ewan D. Milne) [2140017] +- redhat/configs: allow IMA to use MOK keys (Coiby Xu) +- Linux v6.5.0-0.rc1.b6e6cc1f78c7 + +* Fri Jul 14 2023 Fedora Kernel Team [6.5.0-0.rc1.4b810bf037e5.14.el127] +- Linux v6.5.0-0.rc1.4b810bf037e5 + +* Thu Jul 13 2023 Fedora Kernel Team [6.5.0-0.rc1.eb26cbb1a754.13.el127] +- Simplify documentation jobs (Michael Hofmann) +- Auto-cancel pipelines only on MRs (Michael Hofmann) +- CI: Call script directly (Don Zickus) +- CI: Remove stale TAG and Makefile cruft (Don Zickus) +- CI: Move os-build tracking to common area (Don Zickus) +- Linux v6.5.0-0.rc1.eb26cbb1a754 + * Tue Jul 11 2023 Fedora Kernel Team [6.5.0-0.rc1.3f01e9fed845.12.el127] - redhat: use the eln builder for daily jobs (Patrick Talbert) - redhat: set CONFIG_XILINX_WINDOW_WATCHDOG as disabled in pending (Patrick Talbert) diff --git a/patch-6.5-redhat.patch b/patch-6.5-redhat.patch index f36120381..bd00b6bec 100644 --- a/patch-6.5-redhat.patch +++ b/patch-6.5-redhat.patch @@ -38,6 +38,7 @@ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 + drivers/scsi/qla2xxx/qla_os.c | 6 + drivers/scsi/qla4xxx/ql4_os.c | 2 + + drivers/scsi/sd.c | 10 + drivers/usb/core/hub.c | 7 + fs/afs/main.c | 3 + include/linux/efi.h | 22 +- @@ -61,7 +62,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 63 files changed, 1542 insertions(+), 188 deletions(-) + 64 files changed, 1552 insertions(+), 188 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a1457995fd41..33e37745deff 100644 @@ -117,7 +118,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 47690c28456a..f68f41eef27a 100644 +index 658ec2b8aa74..787bdb95aca2 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -171,10 +172,10 @@ index 7a27550ff3c1..cf402933dd3c 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 7856c3a3e35a..8840db28e911 100644 +index a2511b30d0f6..a41975a8f04f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1294,7 +1294,7 @@ endchoice +@@ -1296,7 +1296,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -1075,7 +1076,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index da340f11c5f5..4734307d5eb3 100644 +index caaf563d38ae..d9c4d039c4e7 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1209,7 +1210,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 47d7ba2827ff..e7c333af4afe 100644 +index 37b6fa746662..62a97e568b7f 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -251,6 +251,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1729,6 +1730,34 @@ index b2a3988e1e15..cc22e1ac8fb9 100644 {0, 0}, }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); +diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c +index 68b12afa0721..1f321832f69c 100644 +--- a/drivers/scsi/sd.c ++++ b/drivers/scsi/sd.c +@@ -130,6 +130,14 @@ static const char *sd_cache_types[] = { + "write back, no read (daft)" + }; + ++static const char *sd_probe_types[] = { "async", "sync" }; ++ ++static char sd_probe_type[6] = "async"; ++module_param_string(probe, sd_probe_type, sizeof(sd_probe_type), ++ S_IRUGO|S_IWUSR); ++MODULE_PARM_DESC(probe, "async or sync. Setting to 'sync' disables asynchronous " ++ "device number assignments (sda, sdb, ...)."); ++ + static void sd_set_flush_flag(struct scsi_disk *sdkp) + { + bool wc = false, fua = false; +@@ -3958,6 +3966,8 @@ static int __init init_sd(void) + goto err_out_class; + } + ++ if (!strcmp(sd_probe_type, "sync")) ++ sd_template.gendrv.probe_type = PROBE_FORCE_SYNCHRONOUS; + err = scsi_register_driver(&sd_template.gendrv); + if (err) + goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index a739403a9e45..191513936ce8 100644 --- a/drivers/usb/core/hub.c diff --git a/sources b/sources index bb9d62adb..4a7e3a8dd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-rc1-6-g3f01e9fed845.tar.xz) = ad2bd65ccdcd657ccbeb6136f2baa063f22dd8afe92ccaeacac5d48f896bb1f03398ef2211835f1c2c45d55c2ed70e53898f2f94e9169b84787b0529a1ebcf68 -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 265999e462d08de1b427020b7afc346bf189ab78daad33c8e7729dc3d66b053702fb4a5889b1449cc78146d2d0d22fcf7da33464a20bb2c8019d1fc66bff5bb1 -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 0dea728257d8af75f34c25e1b005eaf772c26a92ad060b7255575f0bb041693355df7f2287e31e13ad48dc79a57202368b876f438597a8caa6ff5776eb5c7d70 +SHA512 (linux-6.5-rc2.tar.xz) = 0988f0ee96a48196e77c2cd4178e8836661c2996688cf813abd40b07f63c034cbff43e8cfbe6165cf5f6154697743ab02c47da8a450993f02fdb734dff73e7ce +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = fd2d064b663a14292b6b19df7b41422eb69874fc8f385f68aeef13c40f808b2b6479c3d84351adcc12518933342ac53e1245d789d896e507c7c3a3bc5678b421 +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 50e295d07f5999b25e8eb58c5a4594bd5902452d958ba3f1be5c8c6a73e42ea8c24ae8836d5be13b86e275339cbdf38b75802ec5d5c32431b7879d0aaaa6d6f1