main/linux-vanilla: upgrade to 3.14.18

3 files changed, 20 insertions, 14 deletions

diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index bae988c47f..6180ea9ac4 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vanilla
 pkgname=linux-${_flavor}
-pkgver=3.14.17
+pkgver=3.14.18
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -164,18 +164,18 @@ dev() {
 md5sums="b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
 59d1fabcccea6a8a3fcf59d610205a6e  fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
 f850c1dd79500cbfa4ce3bab27994a48  kernelconfig.armhf
-448b939182936b35e5517d1afda09bb4  kernelconfig.x86
-6bfa87854bd706267f60b9930bc0ed17  kernelconfig.x86_64
-a9a6539c8df7245c2ab9bfca56f2ef04  patch-3.14.17.xz"
+a4b4693bc22560d8490a387c5e37620f  kernelconfig.x86
+428c840b406b7cec77524ebb0e9f4e71  kernelconfig.x86_64
+f00741b35127573c3cf085fc43f6e3f0  patch-3.14.18.xz"
 sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa  linux-3.14.tar.xz
 e1377ef692929a37f1e638038b10e06a98502f28efc461e1948dcd67df1e7619  fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
 738ba1ca7181179ca3e8c7003302e7f7c079e92296bed0de2ac3d440949cc03c  kernelconfig.armhf
-fee758c16fff4522a94d33c3cb91165aa4d53c62097a28951a1cd59c9ea7bc81  kernelconfig.x86
-fb5c39fb84f07d18bfb402eb35bc95dbc2d918cff074649dff6a6e19004087dc  kernelconfig.x86_64
-50b0e2a6812597b401a417bd1269b5388fdd980b6009d564fff09605100f0df8  patch-3.14.17.xz"
+353983b658b675964cd5f5285a07b5f7fe3bf3aef6ec0c962f9063edbb82e57b  kernelconfig.x86
+795e0dfb98ae64facf39d5346d009a3a13179cc6c76147d413bd8899f8d53233  kernelconfig.x86_64
+3723d8d91e1bba0ed57a4951e8089ebfaa21ac186c3b729b4d2bad2da3eaed9f  patch-3.14.18.xz"
 sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e  linux-3.14.tar.xz
 e8b5a96ddcf55ac9df7de506728a5308f9156086410edf6d354d7c69f6fb450222b25eb062e397889eeb9e5653c3f5110b0603003cca5d6706171b5559ddcd97  fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
 a455628387c05a21b219f9f837e67ddbb42eb7679c63b3eb40968105712893d93e2398b611a333ee6b64fab4be464ca54840fda01ce1f01920e2eafe7b172c5a  kernelconfig.armhf
-7a8c5bb40727afa003cbbc65998d0b4969b907d9b3004d9b7879f20eea5ab799e8d0583cefb101f5da801ac712bd5c2244060c2466ffb4f514ed48d21fac5b7a  kernelconfig.x86
-423b86ff29c90b91446c50d2a84d0043216b2f390a0f63d54394b3ba4005270a28e02ca109e308dccdc4b81c508e00b3f7f59a7c106b48adc7992f2341ea09c6  kernelconfig.x86_64
-03638215934a08a67e3d92d051b6a341e1874872388de910870021934f11f8ed20502a1afbff89a24f0e14053a02f4e40441e2f9878b099ddd1504159ff19872  patch-3.14.17.xz"
+2ef8b5b32bcf250249d329fa8a9762eeb03b5c248ea6ac66b66953e06e1d9cbe29eeca2b6d541d18f2e2e93cd68a3e42d8d6e08af676096396b9139425437b38  kernelconfig.x86
+37c5dca79ad1179e9b3236f7f1419b929da9bf5528c2e8b9bdc6b2989326ed7e2f7b4535548629470aad6ff363047e8448b5f1e83aee845cc80b18aa9c76909c  kernelconfig.x86_64
+c7c5b281986819cb69592cc4c2b7c7d79f34aa86f21db1dd64b795dda79b5f9df95626dada5c8e0613c58d8d7979f37baf0a87cd458f340018ce61b42e4eb6c5  patch-3.14.18.xz"
diff --git a/main/linux-vanilla/kernelconfig.x86 b/main/linux-vanilla/kernelconfig.x86
index d1943657b0..011eb8eee5 100644
--- a/main/linux-vanilla/kernelconfig.x86
+++ b/main/linux-vanilla/kernelconfig.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.16 Kernel Configuration
+# Linux/x86 3.14.18 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -484,7 +484,10 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
+CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
diff --git a/main/linux-vanilla/kernelconfig.x86_64 b/main/linux-vanilla/kernelconfig.x86_64
index 8ed4c4c677..efce74545c 100644
--- a/main/linux-vanilla/kernelconfig.x86_64
+++ b/main/linux-vanilla/kernelconfig.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.16 Kernel Configuration
+# Linux/x86 3.14.18 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -473,7 +473,10 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
+CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set