From 2cbf6b57866c82797a07d584ed6b03f4acc869c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 23 Jul 2018 16:56:32 +0200 Subject: [PATCH] linux4.14: fix arm64.dotconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/linux4.14/files/arm64-dotconfig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/linux4.14/files/arm64-dotconfig b/srcpkgs/linux4.14/files/arm64-dotconfig index 7dba4d355b7..f505c46fa0f 100644 --- a/srcpkgs/linux4.14/files/arm64-dotconfig +++ b/srcpkgs/linux4.14/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.49 Kernel Configuration +# Linux/arm64 4.14.57 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -617,6 +617,7 @@ CONFIG_KEXEC=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_ARM64_SSBD=y # CONFIG_ARMV8_DEPRECATED is not set CONFIG_ARM64_SW_TTBR0_PAN=y @@ -1148,6 +1149,9 @@ CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1155,10 +1159,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m