From: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx> Change CRYPTO_CHACHA_S390 from m to y Upstream commit 349d03ffd5f6 changed CRYPTO_CHACHA_S390 to select CRYPTO_LIB_CHACHA_GENERIC which we already have as built-in. To avoid mismatches, we need to move CRYPTO_CHACHA_S390 from module to built-in. Signed-off-by: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx> diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA_S390 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA_S390 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA_S390 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_CHACHA_S390=y diff --git a/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 b/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 +++ b/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 @@ -1 +1 @@ -CONFIG_CRYPTO_CHACHA_S390=m +CONFIG_CRYPTO_CHACHA_S390=y diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 b/redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_CHACHA_S390=y diff --git a/redhat/configs/pending-ark/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 b/redhat/configs/pending-ark/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_CHACHA_S390=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1834 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx 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/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
