From 5b98bc0ab18ae181f336188c49504d261d42a91c Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 22 Jan 2018 07:22:31 +0100 Subject: extra/linux-zen: update config --- extra/linux-zen/PKGBUILD | 6 +++--- extra/linux-zen/config.i686 | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD index 400c05f8..db774110 100644 --- a/extra/linux-zen/PKGBUILD +++ b/extra/linux-zen/PKGBUILD @@ -1,10 +1,10 @@ -# upstream git: 22001a675b3588001724a7c354a7d667d585c8a3 +# upstream git: 56c96ae9e128a28f383faf72361db89c4d45f17f # fail if upstream's .config changes -sha256sums[6]='f9cf56592b6549b87b19bd4e2bd3ca4c693034f7fa2d7fbf8fa8842308a2df94' +sha256sums[6]='a85bd6e7ff862148b10751a064c710aca6eb9c39a0ba8c06363c299def87d30f' source+=('config.i686') -sha256sums+=('8270f8f4f251639f5d287c1ba45464e05245f7758452b80ba566a5cf0e02839a') +sha256sums+=('e30b5c4451533bfc92c8afff03f04d7084c77b2ec87395089c78f0db20261a26') eval "$( declare -f prepare | \ diff --git a/extra/linux-zen/config.i686 b/extra/linux-zen/config.i686 index ec0ea99e..8f8d4450 100644 --- a/extra/linux-zen/config.i686 +++ b/extra/linux-zen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.11-zen Kernel Configuration +# Linux/x86 4.14.14-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -437,6 +437,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 @@ -1865,6 +1866,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-70-g09d2