X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fs390x;h=3a0f1d00fb90706fe955a5dcea662b81da8a0d2b;hb=c7cc9ca66b994bcee105ef682824dc9946528d6b;hp=509e745bcb450f121845c26ae69ea2b01eb211b7;hpb=e024a12115fed3bb2b010b41b38baa319024b2eb;p=kernel-configs.git

diff --git a/4.14/s390x b/4.14/s390x
index 509e745..3a0f1d0 100644
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.217-gnu Kernel Configuration
+# Linux/s390 4.14.325-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
@@ -716,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
@@ -1172,7 +1175,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
@@ -1218,7 +1220,6 @@ CONFIG_NET_SCH_PLUG=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -1829,10 +1830,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
@@ -1928,6 +1925,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