From 1700cefc512e715349c48680df1478641400342a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 16 Jan 2022 11:16:21 -0600 Subject: kernel-5.15.15-0 * Sun Jan 16 2022 Justin M. Forbes [5.15.15-0] - netfilter: nat: force port remap to prevent shadowing well-known ports (Florian Westphal) - netfilter: conntrack: tag conntracks picked up in local out hook (Florian Westphal) - configs/fedora: Enable CONFIG_NFC_PN532_UART for use PN532 NFC module (Ziqian SUN (Zamir)) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-s390x-debug-fedora.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kernel-s390x-debug-fedora.config') diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 371f0a752..87972fbf4 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1000,8 +1000,8 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y -CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CHACHA20POLY1305=y +CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32C_VPMSUM=m CONFIG_CRYPTO_CRC32C=y @@ -1074,7 +1074,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PAES_S390=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -4032,7 +4032,7 @@ CONFIG_NF_CONNTRACK_TFTP=m # CONFIG_NF_CONNTRACK_TIMEOUT is not set CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NFC_PN532_UART is not set +CONFIG_NFC_PN532_UART=m CONFIG_NFC_PN533_I2C=m CONFIG_NFC_PN533=m CONFIG_NFC_PN533_USB=m -- cgit