X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.18%2Fs390x;fp=4.18%2Fs390x;h=414788550ccd419a48e1fa3c715149f297946264;hb=76a4f0b822e0745414e9f19874dea90829abb7cd;hp=6aaab310ddf6e7ba42b328b317bd5e2ccca29607;hpb=552c75123e2fec2b579bd1cc4b1b4b52b0dcd185;p=kernel-configs.git

diff --git a/4.18/s390x b/4.18/s390x
index 6aaab31..4147885 100644
--- a/4.18/s390x
+++ b/4.18/s390x
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.18.3-gnu Kernel Configuration
+# Linux/s390 4.18.20-gnu Kernel Configuration
 #
 
 #
-# Compiler: s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
+# Compiler: s390x-linux-gcc (GCC) 8.2.0
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -25,7 +25,7 @@ CONFIG_S390=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PGTABLE_LEVELS=5
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=50400
+CONFIG_GCC_VERSION=80200
 CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -1038,8 +1038,8 @@ CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=y
+CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
@@ -1135,7 +1135,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=m
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
@@ -2638,6 +2637,8 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
@@ -2965,7 +2966,6 @@ CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m