From acfca2603860f8a145c3582ec221de0b94a30116 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Thu, 8 Feb 2018 11:32:53 +0000
Subject: [PATCH] kernel: Update to 4.15.2/4.14.18

These kernels have significant changes/addition for Spectre
mitigation as well as the usual other set of fixes.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 kernel/Makefile                                             | 6 +++---
 kernel/config-4.14.x-aarch64                                | 2 +-
 kernel/config-4.14.x-x86_64                                 | 2 +-
 kernel/config-4.15.x-aarch64                                | 2 +-
 kernel/config-4.15.x-x86_64                                 | 2 +-
 ...DIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index 63977171b..8b0c93639 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -204,9 +204,9 @@ endef
 # Build Targets
 # Debug targets only for latest stable and LTS stable
 #
-$(eval $(call kernel,4.15.1,4.15.x,$(EXTRA)))
-$(eval $(call kernel,4.14.17,4.14.x,$(EXTRA)))
-$(eval $(call kernel,4.14.17,4.14.x,-dbg))
+$(eval $(call kernel,4.15.2,4.15.x,$(EXTRA)))
+$(eval $(call kernel,4.14.18,4.14.x,$(EXTRA)))
+$(eval $(call kernel,4.14.18,4.14.x,-dbg))
 $(eval $(call kernel,4.9.80,4.9.x,$(EXTRA)))
 $(eval $(call kernel,4.9.80,4.9.x,-dbg))
 $(eval $(call kernel,4.4.115,4.4.x,$(EXTRA)))
diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64
index d95737019..ce9e01144 100644
--- a/kernel/config-4.14.x-aarch64
+++ b/kernel/config-4.14.x-aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.17 Kernel Configuration
+# Linux/arm64 4.14.18 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64
index a856933f8..cd68159c9 100644
--- a/kernel/config-4.14.x-x86_64
+++ b/kernel/config-4.14.x-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.17 Kernel Configuration
+# Linux/x86 4.14.18 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/kernel/config-4.15.x-aarch64 b/kernel/config-4.15.x-aarch64
index e3a67c00a..e2c64199e 100644
--- a/kernel/config-4.15.x-aarch64
+++ b/kernel/config-4.15.x-aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.15.1 Kernel Configuration
+# Linux/arm64 4.15.2 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
diff --git a/kernel/config-4.15.x-x86_64 b/kernel/config-4.15.x-x86_64
index 972c9d017..0b8428131 100644
--- a/kernel/config-4.15.x-x86_64
+++ b/kernel/config-4.15.x-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.15.1 Kernel Configuration
+# Linux/x86 4.15.2 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch
index 6f18b9b31..bb4e18d89 100644
--- a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch
+++ b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch
@@ -1,4 +1,4 @@
-From a629d501c42e00b7c1e37ab8d8f32e303cd89f7a Mon Sep 17 00:00:00 2001
+From 68f097990b84f65ddf63e483f59f7a33810dbeda Mon Sep 17 00:00:00 2001
 From: Cheng-mean Liu <soccerl@microsoft.com>
 Date: Tue, 11 Jul 2017 16:58:26 -0700
 Subject: [PATCH] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page