From: Coiby Xu coxu@redhat.com

redhat/configs: enable SYSTEM_BLACKLIST_KEYRING which is already enabled in rhel8 and Fedora 34

Upstream Status: RHEL-only

INTEGRITY_PLATFORM_KEYRING which depends on SYSTEM_BLACKLIST_KEYRING is needed to make use of the .platform keyring to verify kdump kernel image signature. By removing configs/ark/generic/CONFIG_SYSTEM_BLACKLIST_KEYRING, configs/common/generic/CONFIG_SYSTEM_BLACKLIST_KEYRING which has CONFIG_SYSTEM_BLACKLIST_KEYRING=y will take precedence.

Suggested-by: Ondrej Mosnacek omosnace@redhat.com Signed-off-by: Coiby Xu coxu@redhat.com

diff --git a/redhat/configs/ark/generic/CONFIG_SYSTEM_BLACKLIST_KEYRING b/redhat/configs/ark/generic/CONFIG_SYSTEM_BLACKLIST_KEYRING deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_SYSTEM_BLACKLIST_KEYRING +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set

-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1385