X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fs390x;h=4e69e2580deadfd6989ba5c3fa9e71101faea097;hb=d78c7225f51f7b7f54f83a70451205dcd20ddf88;hp=98ba22f930ba595f24bbbdf0afc8b29eb297a27a;hpb=61551a3b8428e6893126e84bfafb16d45df6d956;p=kernel-configs.git

diff --git a/4.14/s390x b/4.14/s390x
index 98ba22f..4e69e25 100644
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.271-gnu1 Kernel Configuration
+# Linux/s390 4.14.296-gnu1 Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -1831,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
@@ -1930,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