X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fs390x;h=11cb9e06407758611c9476a1e993da3f4312a321;hb=HEAD;hp=3e9c062fc24dc737a234faf599acd335f1635540;hpb=b9811866e24132aa24255cc7c5f855c1e2290d9f;p=kernel-configs.git

diff --git a/4.14/s390x b/4.14/s390x
index 3e9c062..11cb9e0 100644
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.311-gnu1 Kernel Configuration
+# Linux/s390 4.14.336-gnu1 Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -1175,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
@@ -1226,8 +1225,6 @@ CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -1381,7 +1378,6 @@ CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_SKD is not set
-# CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65536