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

diff --git a/4.14/s390x b/4.14/s390x
index b9234c8..7e32f3f 100644
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.270-gnu1 Kernel Configuration
+# Linux/s390 4.14.292-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