X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fs390x;h=551d0fa5b983f3a148b5918a19a0b94512f4ba6d;hb=5005fa8cec1a9e45f74186a5abaf9b08c1a06059;hp=34cbfadbb3d0030226e828e566edfdbfdc230db9;hpb=f90db3dbe85682e96ce5afce62c042d820b672bc;p=kernel-configs.git

diff --git a/4.14/s390x b/4.14/s390x
index 34cbfad..551d0fa 100644
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.96-gnu Kernel Configuration
+# Linux/s390 4.14.162-gnu Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -1859,6 +1859,7 @@ CONFIG_LEGACY_PTY_COUNT=0
 # CONFIG_NOZOMI is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
+CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
 
@@ -1891,7 +1892,6 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_S390=m
-# CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_HANGCHECK_TIMER=m
@@ -3060,6 +3060,7 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_DMA=y
+# CONFIG_SGL_ALLOC is not set
 CONFIG_DMA_NOOP_OPS=y
 CONFIG_DMA_VIRT_OPS=y
 CONFIG_CPU_RMAP=y