aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vanilla/config-vanilla.x86
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-01-18 21:07:25 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-01-19 02:04:51 +0000
commit849538edbaa8c8d31444404cd5dd1eaed492bd0c (patch)
tree0481acc1dafc21853f36c24a7912e1ea8428a9f9 /main/linux-vanilla/config-vanilla.x86
parentf2f3a06de22b3f503815c79aeae8878b8320f5da (diff)
downloadaports-849538edbaa8c8d31444404cd5dd1eaed492bd0c.tar.gz
aports-849538edbaa8c8d31444404cd5dd1eaed492bd0c.tar.bz2
aports-849538edbaa8c8d31444404cd5dd1eaed492bd0c.tar.xz
main/linux-vanilla: upgrade to 4.14.14
Diffstat (limited to 'main/linux-vanilla/config-vanilla.x86')
-rw-r--r--main/linux-vanilla/config-vanilla.x865
1 files changed, 3 insertions, 2 deletions
diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86
index 3404e3cb90..b1ae07e5c3 100644
--- a/main/linux-vanilla/config-vanilla.x86
+++ b/main/linux-vanilla/config-vanilla.x86
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.13 Kernel Configuration
+# Linux/x86 4.14.14 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -420,6 +420,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
CONFIG_X86_MPPARSE=y
CONFIG_X86_BIGSMP=y
# CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
# CONFIG_INTEL_RDT is not set
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_GOLDFISH is not set
@@ -1687,6 +1688,7 @@ CONFIG_DEBUG_DEVRES=y
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_SPI=m
@@ -7241,7 +7243,6 @@ CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
-CONFIG_FONT_AUTOSELECT=y
# CONFIG_SG_SPLIT is not set
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y