projects
/
kernel-configs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update configs
[kernel-configs.git]
/
4.14
/
s390x
diff --git
a/4.14/s390x
b/4.14/s390x
index d503194c96fbf57b79736b6431251b43a13f7e19..4e69e2580deadfd6989ba5c3fa9e71101faea097 100644
(file)
--- a/
4.14/s390x
+++ b/
4.14/s390x
@@
-1,6
+1,6
@@
#
# Automatically generated file; DO NOT EDIT.
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.2
27-gnu
Kernel Configuration
+# Linux/s390 4.14.2
96-gnu1
Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
#
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_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
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_PACKET=y
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
CONFIG_UNIX_DIAG=m
CONFIG_TLS=m
CONFIG_XFRM=y
CONFIG_UNIX_DIAG=m
CONFIG_TLS=m
CONFIG_XFRM=y
@@
-1829,10
+1831,6
@@
CONFIG_CCWGROUP=m
#
# CONFIG_WAN is not set
# CONFIG_VMXNET3 is not set
#
# 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
#
# Input device support
@@
-1928,6
+1926,8
@@
CONFIG_MONREADER=m
CONFIG_MONWRITER=m
CONFIG_S390_VMUR=m
# CONFIG_XILLYBUS is not set
CONFIG_MONWRITER=m
CONFIG_S390_VMUR=m
# CONFIG_XILLYBUS is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
#
# I2C support