diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-06 06:15:34 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-06 06:15:34 +0200 |
commit | 1ad050a2fe8600ce55c1c635296588356f8e46c9 (patch) | |
tree | a9bdc68ea0ff4fe0f310d373b812fc3b19854b34 /kernel-ppc64le-rhel.config | |
parent | db2ec89709f8c0db5edc0fcddef64f35d834ad4e (diff) | |
parent | f1d22013a4efa43f188cac6300d3945a423ec49a (diff) | |
download | kernel-1ad050a2fe8600ce55c1c635296588356f8e46c9.tar.gz kernel-1ad050a2fe8600ce55c1c635296588356f8e46c9.tar.xz kernel-1ad050a2fe8600ce55c1c635296588356f8e46c9.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc4.20210805git251a1524293d.37.vanilla.1.fc35kernel-5.14.0-0.rc4.20210805git251a1524293d.37.vanilla.1.fc34kernel-5.14.0-0.rc4.20210805git251a1524293d.37.vanilla.1.fc33
Diffstat (limited to 'kernel-ppc64le-rhel.config')
-rw-r--r-- | kernel-ppc64le-rhel.config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d1637c237..f116ec896 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -915,9 +915,9 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m # CONFIG_CRYPTO_SHA512_ARM64 is not set CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SKEIN is not set -CONFIG_CRYPTO_SM2=m -CONFIG_CRYPTO_SM3=m -CONFIG_CRYPTO_SM4=m +# CONFIG_CRYPTO_SM2 is not set +# CONFIG_CRYPTO_SM3 is not set +# CONFIG_CRYPTO_SM4 is not set # CONFIG_CRYPTO_SPECK is not set # CONFIG_CRYPTO_SPECK_NEON is not set CONFIG_CRYPTO_STATS=y @@ -3323,7 +3323,7 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_INGRESS=y # CONFIG_NETFILTER_NETLINK_ACCT is not set CONFIG_NETFILTER_NETLINK_GLUE_CT=y -# CONFIG_NETFILTER_NETLINK_HOOK is not set +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m |