X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.9%2Fs390x;h=4b78ad7b1a0fa975af32fbb53d51808a0e75dfd5;hb=a77ab2e66842a2dbc03218072a753e8591a473c3;hp=b1547dbd6076ae071c9d767a85d45e69b83dfff0;hpb=477b28721438f786775f8cd3df18d811767fe8c8;p=kernel-configs.git

diff --git a/4.9/s390x b/4.9/s390x
index b1547db..4b78ad7 100644
--- a/4.9/s390x
+++ b/4.9/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.9.122-gnu Kernel Configuration
+# Linux/s390 4.9.299-gnu1 Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -43,10 +43,10 @@ CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_LZ4=y
-# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -181,7 +181,6 @@ CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_BPF_SYSCALL=y
-# CONFIG_BPF_JIT_ALWAYS_ON is not set
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
@@ -250,7 +249,7 @@ CONFIG_CLONE_BACKWARDS2=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_COMPAT_OLD_SIGACTION=y
-# CONFIG_CPU_NO_EFFICIENT_FFS is not set
+CONFIG_CPU_NO_EFFICIENT_FFS=y
 # CONFIG_HAVE_ARCH_VMAP_STACK is not set
 
 #
@@ -394,33 +393,33 @@ CONFIG_LIVEPATCH=y
 # Processor type and features
 #
 CONFIG_HAVE_MARCH_Z900_FEATURES=y
-CONFIG_HAVE_MARCH_Z990_FEATURES=y
-CONFIG_HAVE_MARCH_Z9_109_FEATURES=y
-CONFIG_HAVE_MARCH_Z10_FEATURES=y
-CONFIG_HAVE_MARCH_Z196_FEATURES=y
-CONFIG_HAVE_MARCH_ZEC12_FEATURES=y
+# CONFIG_HAVE_MARCH_Z990_FEATURES is not set
+# CONFIG_HAVE_MARCH_Z9_109_FEATURES is not set
+# CONFIG_HAVE_MARCH_Z10_FEATURES is not set
+# CONFIG_HAVE_MARCH_Z196_FEATURES is not set
+# CONFIG_HAVE_MARCH_ZEC12_FEATURES is not set
 # CONFIG_HAVE_MARCH_Z13_FEATURES is not set
-# CONFIG_MARCH_Z900 is not set
+CONFIG_MARCH_Z900=y
 # CONFIG_MARCH_Z990 is not set
 # CONFIG_MARCH_Z9_109 is not set
 # CONFIG_MARCH_Z10 is not set
 # CONFIG_MARCH_Z196 is not set
-CONFIG_MARCH_ZEC12=y
+# CONFIG_MARCH_ZEC12 is not set
 # CONFIG_MARCH_Z13 is not set
-# CONFIG_MARCH_Z900_TUNE is not set
+CONFIG_MARCH_Z900_TUNE=y
 # CONFIG_MARCH_Z990_TUNE is not set
 # CONFIG_MARCH_Z9_109_TUNE is not set
 # CONFIG_MARCH_Z10_TUNE is not set
 # CONFIG_MARCH_Z196_TUNE is not set
-CONFIG_MARCH_ZEC12_TUNE=y
+# CONFIG_MARCH_ZEC12_TUNE is not set
 # CONFIG_MARCH_Z13_TUNE is not set
 # CONFIG_TUNE_DEFAULT is not set
-# CONFIG_TUNE_Z900 is not set
+CONFIG_TUNE_Z900=y
 # CONFIG_TUNE_Z990 is not set
 # CONFIG_TUNE_Z9_109 is not set
 # CONFIG_TUNE_Z10 is not set
 # CONFIG_TUNE_Z196 is not set
-CONFIG_TUNE_ZEC12=y
+# CONFIG_TUNE_ZEC12 is not set
 # CONFIG_TUNE_Z13 is not set
 CONFIG_64BIT=y
 CONFIG_COMPAT=y
@@ -605,6 +604,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_ALGO=m
@@ -1199,7 +1199,6 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
-CONFIG_BPF_JIT=y
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1232,7 +1231,6 @@ CONFIG_LWTUNNEL=y
 CONFIG_DST_CACHE=y
 CONFIG_NET_DEVLINK=m
 CONFIG_MAY_USE_DEVLINK=m
-CONFIG_HAVE_EBPF_JIT=y
 # CONFIG_PCMCIA is not set
 CONFIG_CCW=y
 
@@ -1747,6 +1745,7 @@ CONFIG_LEGACY_PTY_COUNT=0
 # CONFIG_NOZOMI is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
+CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
 
@@ -1776,7 +1775,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_TPM=m
-# CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_HANGCHECK_TIMER=m
@@ -2652,11 +2650,11 @@ CONFIG_IMA_LSM_RULES=y
 CONFIG_IMA_NG_TEMPLATE=y
 # CONFIG_IMA_SIG_TEMPLATE is not set
 CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
-CONFIG_IMA_DEFAULT_HASH_SHA1=y
+# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
 # CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
-# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
+CONFIG_IMA_DEFAULT_HASH_SHA512=y
 # CONFIG_IMA_DEFAULT_HASH_WP512 is not set
-CONFIG_IMA_DEFAULT_HASH="sha1"
+CONFIG_IMA_DEFAULT_HASH="sha512"
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_APPRAISE=y