From e8711e2104f62fc9da53ffd3739a933724f268b7 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@tele2.at>
Date: Mon, 12 Feb 2018 03:30:33 +0100
Subject: [PATCH] Bump linux version to recent LTS

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
---
 board/alix/linux.config | 10 ++++++++--
 pkg/linux/build         |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/board/alix/linux.config b/board/alix/linux.config
index f9e941b..ae4a63f 100644
--- a/board/alix/linux.config
+++ b/board/alix/linux.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.1 Kernel Configuration
+# Linux/x86 4.14.18 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -157,12 +157,15 @@ CONFIG_NET_NS=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="/home/goliath/dev/cross/alix/deploy/initrd/initrd.list"
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
+CONFIG_INITRAMFS_COMPRESSION=".gz"
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
@@ -285,6 +288,7 @@ CONFIG_OLD_SIGACTION=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 
 #
@@ -366,6 +370,7 @@ CONFIG_ZONE_DMA=y
 CONFIG_X86_FEATURE_NAMES=y
 CONFIG_X86_FAST_FEATURE_TESTS=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
@@ -1014,6 +1019,7 @@ CONFIG_ALLOW_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_DMA_SHARED_BUFFER is not set
@@ -2937,7 +2943,7 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_FRAME_POINTER_UNWINDER=y
+CONFIG_UNWINDER_FRAME_POINTER=y
 
 #
 # Security options
diff --git a/pkg/linux/build b/pkg/linux/build
index 1556309..2059fe6 100755
--- a/pkg/linux/build
+++ b/pkg/linux/build
@@ -1,12 +1,12 @@
 MAJOR="4"
 MINOR="14"
-RELEASE="1"
+RELEASE="18"
 
 VERSION="$MAJOR.$MINOR.$RELEASE"
 SRCDIR="linux-$VERSION"
 TARBALL="linux-$VERSION.tar.xz"
 URL="https://www.kernel.org/pub/linux/kernel/v$MAJOR.x"
-SHA256SUM="6fb9f67002f986ce3905b35466e35c394e0fa3eb7c32df508514717955cb4de7"
+SHA256SUM="866a94c1c38d923ae18e74b683d7a8a79b674ebdfe7f40f1a3be9a27d39fe354"
 DEPENDS="initrd"
 
 prepare() {