From: Vladis Dronov <vdronov@xxxxxxxxxx>
[redhat] Unify crypto CHACHA20 and POLY1305 configs
Currently CRYPTO_CHACHA20* and CRYPTO_*POLY1305* configs are not in order.
Unify them by merging and moving to configs/common/. Also enable CRYPTO_
CHACHA20POLY1305 on PowerPC as it was done in rhbz#1734711.
Detailed actions taken:
Move:
configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20:CONFIG_CRYPTO_CHACHA20=y
configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_POLY1305:CONFIG_CRYPTO_POLY1305=y
configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20POLY1305:CONFIG_CRYPTO_CHACHA20POLY1305=y
to
configs/common/generic/s390x/zfcpdump/
Delete (per rhbz#1734711):
configs/ark/generic/powerpc/CONFIG_CRYPTO_CHACHA20POLY1305:# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
Delete: configs/pending-common/generic/CONFIG_CRYPTO_POLY1305_NEON:# CONFIG_CRYPTO_POLY1305_NEON is not set
And move:
configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_POLY1305_NEON:CONFIG_CRYPTO_POLY1305_NEON=m
to:
configs/common/generic/arm/aarch64/CONFIG_CRYPTO_POLY1305_NEON
Merge:
configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_NEON:CONFIG_CRYPTO_NHPOLY1305_NEON=m
configs/fedora/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON:CONFIG_CRYPTO_NHPOLY1305_NEON=m
to:
configs/common/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON
Merge:
configs/ark/generic/CONFIG_CRYPTO_CHACHA20_NEON:CONFIG_CRYPTO_CHACHA20_NEON=m
configs/fedora/generic/arm/CONFIG_CRYPTO_CHACHA20_NEON:CONFIG_CRYPTO_CHACHA20_NEON=m
to:
configs/common/generic/arm/CONFIG_CRYPTO_CHACHA20_NEON
Merge:
configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_AVX2:CONFIG_CRYPTO_NHPOLY1305_AVX2=m
configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_AVX2:CONFIG_CRYPTO_NHPOLY1305_AVX2=m
to (depends on X86 && 64BIT):
configs/common/generic/x86/x86_64/CONFIG_CRYPTO_NHPOLY1305_AVX2
Merge:
configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_SSE2:CONFIG_CRYPTO_NHPOLY1305_SSE2=m
configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_SSE2:CONFIG_CRYPTO_NHPOLY1305_SSE2=m
to (depends on X86 && 64BIT):
configs/common/generic/x86/x86_64/CONFIG_CRYPTO_NHPOLY1305_SSE2
The result:
$ git grep -e CRYPTO_CHACHA20 -e CRYPTO_POLY1305 -e CRYPTO_NHPOLY1305
configs/common/generic/CONFIG_CRYPTO_CHACHA20:CONFIG_CRYPTO_CHACHA20=m
configs/common/generic/CONFIG_CRYPTO_CHACHA20POLY1305:CONFIG_CRYPTO_CHACHA20POLY1305=m
configs/common/generic/CONFIG_CRYPTO_POLY1305:CONFIG_CRYPTO_POLY1305=m
configs/common/generic/arm/CONFIG_CRYPTO_CHACHA20_NEON:CONFIG_CRYPTO_CHACHA20_NEON=m
configs/common/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON:CONFIG_CRYPTO_NHPOLY1305_NEON=m
configs/common/generic/arm/aarch64/CONFIG_CRYPTO_POLY1305_NEON:CONFIG_CRYPTO_POLY1305_NEON=m
configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20:CONFIG_CRYPTO_CHACHA20=y
configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20POLY1305:CONFIG_CRYPTO_CHACHA20POLY1305=y
configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_POLY1305:CONFIG_CRYPTO_POLY1305=y
configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_64:CONFIG_CRYPTO_CHACHA20_X86_64=m
configs/common/generic/x86/x86_64/CONFIG_CRYPTO_NHPOLY1305_AVX2:CONFIG_CRYPTO_NHPOLY1305_AVX2=m
configs/common/generic/x86/x86_64/CONFIG_CRYPTO_NHPOLY1305_SSE2:CONFIG_CRYPTO_NHPOLY1305_SSE2=m
configs/common/generic/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_64:CONFIG_CRYPTO_POLY1305_X86_64=m
configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_POLY1305_ARM:CONFIG_CRYPTO_POLY1305_ARM=m
Signed-off-by: Vladis Dronov <vdronov@xxxxxxxxxx>
diff a/redhat/configs/ark/generic/powerpc/CONFIG_CRYPTO_CHACHA20POLY1305 b/redhat/configs/ark/generic/powerpc/CONFIG_CRYPTO_CHACHA20POLY1305
--- a/redhat/configs/ark/generic/powerpc/CONFIG_CRYPTO_CHACHA20POLY1305
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
diff a/redhat/configs/ark/generic/CONFIG_CRYPTO_CHACHA20_NEON b/redhat/configs/common/generic/arm/CONFIG_CRYPTO_CHACHA20_NEON
--- a/redhat/configs/ark/generic/CONFIG_CRYPTO_CHACHA20_NEON
+++ b/redhat/configs/common/generic/arm/CONFIG_CRYPTO_CHACHA20_NEON
diff a/redhat/configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_NEON b/redhat/configs/common/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON
--- a/redhat/configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_NEON
+++ b/redhat/configs/common/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON
diff a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_POLY1305_NEON b/redhat/configs/common/generic/arm/aarch64/CONFIG_CRYPTO_POLY1305_NEON
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_POLY1305_NEON
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_CRYPTO_POLY1305_NEON
diff a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20 b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20
--- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20
+++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20
diff a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20POLY1305 b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20POLY1305
--- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20POLY1305
+++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20POLY1305
diff a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_POLY1305 b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_POLY1305
--- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_POLY1305
+++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_POLY1305
diff a/redhat/configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_AVX2 b/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_NHPOLY1305_AVX2
--- a/redhat/configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_AVX2
+++ b/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_NHPOLY1305_AVX2
diff a/redhat/configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_SSE2 b/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_NHPOLY1305_SSE2
--- a/redhat/configs/ark/generic/CONFIG_CRYPTO_NHPOLY1305_SSE2
+++ b/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_NHPOLY1305_SSE2
diff a/redhat/configs/fedora/generic/arm/CONFIG_CRYPTO_CHACHA20_NEON b/redhat/configs/fedora/generic/arm/CONFIG_CRYPTO_CHACHA20_NEON
--- a/redhat/configs/fedora/generic/arm/CONFIG_CRYPTO_CHACHA20_NEON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CHACHA20_NEON=m
diff a/redhat/configs/fedora/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON b/redhat/configs/fedora/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON
--- a/redhat/configs/fedora/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_NHPOLY1305_NEON=m
diff a/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_AVX2 b/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_AVX2
--- a/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_AVX2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_NHPOLY1305_AVX2=m
diff a/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_SSE2 b/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_SSE2
--- a/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_SSE2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_NHPOLY1305_SSE2=m
diff a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_POLY1305_NEON b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_POLY1305_NEON
--- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_POLY1305_NEON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_POLY1305_NEON is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/951
_______________________________________________
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
