X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fx86-64;h=8d0fc58265d116b6e3f3f20b7eb9e4b5c5353367;hb=aa2db21d6491ae3c329a3e0814793e370b5b7de1;hp=a2f6e785736cb168cf149331eef9cc5acc66b05e;hpb=770b75651eb4baedfc3328860ba6eb3412bd7d90;p=kernel-configs.git

diff --git a/4.14/x86-64 b/4.14/x86-64
index a2f6e78..8d0fc58 100644
--- a/4.14/x86-64
+++ b/4.14/x86-64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.125-gnu Kernel Configuration
+# Linux/x86_64 4.14.156-gnu Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -674,6 +674,9 @@ CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
 CONFIG_X86_INTEL_MPX=y
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_MIXED=y
@@ -6662,7 +6665,6 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
 CONFIG_USB_CYPRESS_CY7C63=m
@@ -9486,6 +9488,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
+CONFIG_SGL_ALLOC=y
 # CONFIG_DMA_NOOP_OPS is not set
 CONFIG_DMA_VIRT_OPS=y
 CONFIG_CHECK_SIGNATURE=y