From: Don Zickus <[email protected]> Combine duplicate configs across ark and fedora into common
Used redhat/configs/evaluate_configs -j and it made these changes. Signed-off-by: Don Zickus <[email protected]> diff a/redhat/configs/ark/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND b/redhat/configs/common/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND --- a/redhat/configs/ark/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND +++ b/redhat/configs/common/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND diff a/redhat/configs/ark/generic/CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG b/redhat/configs/common/generic/CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG --- a/redhat/configs/ark/generic/CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG +++ b/redhat/configs/common/generic/CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG diff a/redhat/configs/ark/generic/CONFIG_ENCRYPTED_KEYS b/redhat/configs/common/generic/CONFIG_ENCRYPTED_KEYS --- a/redhat/configs/ark/generic/CONFIG_ENCRYPTED_KEYS +++ b/redhat/configs/common/generic/CONFIG_ENCRYPTED_KEYS diff a/redhat/configs/ark/generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK b/redhat/configs/common/generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK --- a/redhat/configs/ark/generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK +++ b/redhat/configs/common/generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK diff a/redhat/configs/ark/generic/CONFIG_PM_DEVFREQ b/redhat/configs/common/generic/CONFIG_PM_DEVFREQ --- a/redhat/configs/ark/generic/CONFIG_PM_DEVFREQ +++ b/redhat/configs/common/generic/CONFIG_PM_DEVFREQ diff a/redhat/configs/ark/generic/powerpc/CONFIG_IMA_ARCH_POLICY b/redhat/configs/common/generic/powerpc/CONFIG_IMA_ARCH_POLICY --- a/redhat/configs/ark/generic/powerpc/CONFIG_IMA_ARCH_POLICY +++ b/redhat/configs/common/generic/powerpc/CONFIG_IMA_ARCH_POLICY diff a/redhat/configs/ark/generic/powerpc/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT b/redhat/configs/common/generic/powerpc/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT --- a/redhat/configs/ark/generic/powerpc/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT +++ b/redhat/configs/common/generic/powerpc/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT diff a/redhat/configs/ark/generic/powerpc/CONFIG_PPC_SECURE_BOOT b/redhat/configs/common/generic/powerpc/CONFIG_PPC_SECURE_BOOT --- a/redhat/configs/ark/generic/powerpc/CONFIG_PPC_SECURE_BOOT +++ b/redhat/configs/common/generic/powerpc/CONFIG_PPC_SECURE_BOOT diff a/redhat/configs/ark/generic/powerpc/CONFIG_PPC_SECVAR_SYSFS b/redhat/configs/common/generic/powerpc/CONFIG_PPC_SECVAR_SYSFS --- a/redhat/configs/ark/generic/powerpc/CONFIG_PPC_SECVAR_SYSFS +++ b/redhat/configs/common/generic/powerpc/CONFIG_PPC_SECVAR_SYSFS diff a/redhat/configs/ark/generic/s390x/CONFIG_MISC_RTSX_PCI b/redhat/configs/common/generic/s390x/CONFIG_MISC_RTSX_PCI --- a/redhat/configs/ark/generic/s390x/CONFIG_MISC_RTSX_PCI +++ b/redhat/configs/common/generic/s390x/CONFIG_MISC_RTSX_PCI diff a/redhat/configs/ark/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_GEN b/redhat/configs/common/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_GEN --- a/redhat/configs/ark/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_GEN +++ b/redhat/configs/common/generic/s390x/CONFIG_VIRT_CPU_ACCOUNTING_GEN diff a/redhat/configs/ark/generic/x86/CONFIG_IMA_ARCH_POLICY b/redhat/configs/common/generic/x86/CONFIG_IMA_ARCH_POLICY --- a/redhat/configs/ark/generic/x86/CONFIG_IMA_ARCH_POLICY +++ b/redhat/configs/common/generic/x86/CONFIG_IMA_ARCH_POLICY diff a/redhat/configs/ark/generic/x86/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT b/redhat/configs/common/generic/x86/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT --- a/redhat/configs/ark/generic/x86/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT +++ b/redhat/configs/common/generic/x86/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT diff a/redhat/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND b/redhat/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND --- a/redhat/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set diff a/redhat/configs/fedora/generic/CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG b/redhat/configs/fedora/generic/CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG --- a/redhat/configs/fedora/generic/CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y diff a/redhat/configs/fedora/generic/CONFIG_ENCRYPTED_KEYS b/redhat/configs/fedora/generic/CONFIG_ENCRYPTED_KEYS --- a/redhat/configs/fedora/generic/CONFIG_ENCRYPTED_KEYS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ENCRYPTED_KEYS=y diff a/redhat/configs/fedora/generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK b/redhat/configs/fedora/generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK --- a/redhat/configs/fedora/generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK +++ /dev/null @@ -1,28 +0,0 @@ -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK: -# -# Enabling this option forces a sysfs userspace fallback mechanism -# to be used for all firmware requests which explicitly do not disable a -# a fallback mechanism. Firmware calls which do prohibit a fallback -# mechanism is request_firmware_direct(). This option is kept for -# backward compatibility purposes given this precise mechanism can also -# be enabled by setting the proc sysctl value to true: -# -# /proc/sys/kernel/firmware_config/force_sysfs_fallback -# -# If you are unsure about this, say N here. -# -# Symbol: FW_LOADER_USER_HELPER_FALLBACK [=n] -# Type : bool -# Defined at drivers/base/firmware_loader/Kconfig:143 -# Prompt: Force the firmware sysfs fallback mechanism when possible -# Depends on: FW_LOADER [=y] && FW_LOADER_USER_HELPER [=y] -# Location: -# -> Device Drivers -# -> Generic Driver Options -# -> Firmware loader -# -> Firmware loading facility (FW_LOADER [=y]) -# -> Enable the firmware sysfs fallback mechanism (FW_LOADER_USER_HELPER [=y]) -# -# -# -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set diff a/redhat/configs/fedora/generic/CONFIG_PM_DEVFREQ b/redhat/configs/fedora/generic/CONFIG_PM_DEVFREQ --- a/redhat/configs/fedora/generic/CONFIG_PM_DEVFREQ +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_PM_DEVFREQ is not set diff a/redhat/configs/fedora/generic/powerpc/CONFIG_IMA_ARCH_POLICY b/redhat/configs/fedora/generic/powerpc/CONFIG_IMA_ARCH_POLICY --- a/redhat/configs/fedora/generic/powerpc/CONFIG_IMA_ARCH_POLICY +++ /dev/null @@ -1 +0,0 @@ -CONFIG_IMA_ARCH_POLICY=y diff a/redhat/configs/fedora/generic/powerpc/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT b/redhat/configs/fedora/generic/powerpc/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT --- a/redhat/configs/fedora/generic/powerpc/CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/996 _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected] Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
