X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fs390x;h=2951eeb432044fa88381d037205ebf5fd8d47f69;hb=76f0719fc8b6687874de4dcddd3d46fd3dcc158d;hp=bb9ac29311228344f9808a24e65c68cbf3540f80;hpb=3367f9bdfe902f1ff65dcae192ca77eb588be0b3;p=kernel-configs.git

diff --git a/4.14/s390x b/4.14/s390x
index bb9ac29..2951eeb 100644
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.273-gnu1 Kernel Configuration
+# Linux/s390 4.14.302-gnu1 Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -718,6 +718,7 @@ CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
@@ -1831,10 +1832,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 +1927,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