From 104d689c1aa41159da556b3ae90d3b25ef3771c6 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 07:08:06 +0100
Subject: core/linux: update config

---
 core/linux/PKGBUILD    | 6 +++---
 core/linux/config.i686 | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'core/linux')

diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 4cf22747..cb0fb2cf 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -1,10 +1,10 @@
-# upstream git: f185e186b3f1e07433fe7d585825d53c20c354fe
+# upstream git: 56c96ae9e128a28f383faf72361db89c4d45f17f
 
 # fail if upstream's .config changes
-sha256sums[4]='24b8cf6829dafcb2b5c76cffaae6438ad2d432f13d6551fa1c8f25e66b751ed4'
+sha256sums[4]='edaf7bebcaf3032e3bf15353e0773e39872c73fc024ca4d23383195a13745b2e'
 
 source+=('config.i686')
-sha256sums+=('b51bb103b11e3960d8e8bad5a17d2376697250b3dc089243a6d7e40e86d4061c')
+sha256sums+=('2ba9fb36a8657a92972b8c4bb8e2e4ebd795b9abcf44092f5a4e006cab1fd07c')
 
 eval "$(
   declare -f prepare | \
diff --git a/core/linux/config.i686 b/core/linux/config.i686
index 75434d95..2d1e0274 100644
--- a/core/linux/config.i686
+++ b/core/linux/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.11-1 Kernel Configuration
+# Linux/x86 4.14.14-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -429,6 +429,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
 CONFIG_INTEL_RDT=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
@@ -1838,6 +1839,7 @@ CONFIG_DEV_COREDUMP=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=y
 CONFIG_REGMAP_SPI=y
-- 
cgit v1.2.3