X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=4.14%2Fs390x;h=816e6d958d3481751bd139819fb2a7c68731e983;hb=96f72fae57373690e8869950726ea65d3ed16a85;hp=1879394e29f10128364869196613984097cffafe;hpb=044f146aec0a9edc83a35a005a264ed6f3271538;p=kernel-configs.git

diff --git a/4.14/s390x b/4.14/s390x
index 1879394..816e6d9 100644
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.238-gnu Kernel Configuration
+# Linux/s390 4.14.282-gnu1 Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -190,6 +190,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
@@ -673,6 +674,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
 CONFIG_XFRM=y
@@ -1829,10 +1831,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_RRPC=m
-CONFIG_NVM_PBLK=m
 
 #
 # Input device support