X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.9%2Fs390x;h=61b6a5cc91f3ed4b16f4abd03260fa3cb41e764f;hb=96f72fae57373690e8869950726ea65d3ed16a85;hp=9a4712ea23f61bd7151c7cd80ccd948b531a577c;hpb=15d67f6dd2fff64a5b1328a589fca4ab7344eda8;p=kernel-configs.git

diff --git a/4.9/s390x b/4.9/s390x
index 9a4712e..61b6a5c 100644
--- a/4.9/s390x
+++ b/4.9/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.9.295-gnu1 Kernel Configuration
+# Linux/s390 4.9.317-gnu1 Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -184,6 +184,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_USERFAULTFD=y
 CONFIG_MEMBARRIER=y
 # CONFIG_EMBEDDED is not set
@@ -1718,10 +1719,6 @@ CONFIG_CCWGROUP=m
 #
 # CONFIG_WAN is not set
 # CONFIG_VMXNET3 is not set
-CONFIG_NVM=y
-# CONFIG_NVM_DEBUG is not set
-CONFIG_NVM_GENNVM=m
-CONFIG_NVM_RRPC=m
 
 #
 # Input device support