X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fs390x;h=7e32f3fe7ad23319d6d9a54b118a70cd286cc696;hb=9745a36731ba5afd4f9fd0e2c0da20dd6526e834;hp=5a4f46b823c577a4e3e1a642dcc9d934d2435dd8;hpb=555edcec1bf166f41adb6c1999db917007b81124;p=kernel-configs.git

diff --git a/4.14/s390x b/4.14/s390x
index 5a4f46b..7e32f3f 100644
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.261-gnu1 Kernel Configuration
+# Linux/s390 4.14.292-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
@@ -1830,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
@@ -1929,6 +1926,8 @@ CONFIG_MONREADER=m
 CONFIG_MONWRITER=m
 CONFIG_S390_VMUR=m
 # CONFIG_XILLYBUS is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support