Update to 4.14.2-1

3 files changed, 44 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4764b331e5f6..3a45307089c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Tue Nov 21 19:13:55 UTC 2017
+# Fri Nov 24 20:06:04 UTC 2017
 pkgbase = linux-ck
-	pkgver = 4.14.1
+	pkgver = 4.14.2
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -13,8 +13,8 @@ pkgbase = linux-ck
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.1.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.1.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.2.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.2.sign
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
@@ -22,17 +22,27 @@ pkgbase = linux-ck
 	source = enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch::https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch
 	source = http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz
 	source = 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
+	source = https://github.com/ckolivas/linux/pull/7/commits/811cb391e71c1d60387dbbd6ae0bbc4e61f06acb.patch
+	source = https://github.com/ckolivas/linux/pull/7/commits/6bfb805cbac27b18fb4ad7537fe90dfc39e17f35.patch
+	source = https://github.com/ckolivas/linux/pull/7/commits/1588e6bf316231685204e358dfe172851b39fd1e.patch
+	source = https://github.com/ckolivas/linux/pull/7/commits/df2a75f4864b30011ab6a6f365d9378d8eafa53b.patch
+	source = https://github.com/ckolivas/linux/pull/7/commits/a79d648fcde72fc98048d4435bc86864a59fd01b.patch
 	sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
 	sha256sums = SKIP
-	sha256sums = 5af72b487fbcc8e7fd3f5392271490c8498ffb2048e77abaf406971a7382f8d7
+	sha256sums = 2dc86272e55d31c55bdeaa47b3d44fbd6235a396e37d82c2b47aa27f6ba82ee3
 	sha256sums = SKIP
-	sha256sums = 25e73d0e037b7e5cd5fd59f72dda89b3a155139586aee448bf5b69d6c01cc408
+	sha256sums = a3f066921cbfb65f2fd4d1e3977989d19835396ee27aabf84700f9ba7ff9cd4b
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = 8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8
 	sha256sums = 44d10c573112dc2b64d39ea33c2a10fbbdd84f9877b8d736acc09b2516299474
 	sha256sums = 6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd
+	sha256sums = 24b74a975e61293cdd4ce37845a27f550102b0481017336e15df3334a82cef02
+	sha256sums = 453ccb01d9e56ea3a33621516f0d52568e836d1932ff14e26567cc3fe2101a17
+	sha256sums = d2f59cf1c5187204eced6e53806b187e90698fcb2309955aed4020a15c659ae1
+	sha256sums = 3d4d2506795c4bd914959758f5b69ccf5a4f5a21f5d4bfc87bf0aa3b4b58f4c6
+	sha256sums = 0dbf2d23df0b5d023794332872b8b346d0c4994576b778396364e803acac4498
 
 pkgname = linux-ck
 	pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.162
@@ -42,12 +52,12 @@ pkgname = linux-ck
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux-ck=4.14.1
+	provides = linux-ck=4.14.2
 	backup = etc/mkinitcpio.d/linux-ck.preset
 
 pkgname = linux-ck-headers
 	pkgdesc = Header files and scripts for building modules for Linux-ck kernel
 	depends = linux-ck
-	provides = linux-ck-headers=4.14.1
-	provides = linux-headers=4.14.1
+	provides = linux-ck-headers=4.14.2
+	provides = linux-headers=4.14.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 75554eaf3d50..d851b0b928b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -39,7 +39,7 @@ _use_current=
 
 pkgbase=linux-ck
 _srcname=linux-4.14
-pkgver=4.14.1
+pkgver=4.14.2
 pkgrel=1
 _ckpatchversion=1
 arch=('x86_64')
@@ -49,6 +49,7 @@ makedepends=('kmod' 'inetutils' 'bc' 'libelf')
 options=('!strip')
 _ckpatchname="patch-4.14-ck${_ckpatchversion}"
 _gcc_patch='enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch'
+_preck2='https://github.com/ckolivas/linux/pull/7/commits'
 source=(
   "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
   "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
@@ -61,6 +62,12 @@ source=(
   "$_gcc_patch::https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch"
   "http://ck.kolivas.org/patches/4.0/4.14/4.14-ck${_ckpatchversion}/${_ckpatchname}.xz"
   '0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch'
+  # pre ck2 patches
+  "$_preck2/811cb391e71c1d60387dbbd6ae0bbc4e61f06acb.patch"
+  "$_preck2/6bfb805cbac27b18fb4ad7537fe90dfc39e17f35.patch"
+  "$_preck2/1588e6bf316231685204e358dfe172851b39fd1e.patch"
+  "$_preck2/df2a75f4864b30011ab6a6f365d9378d8eafa53b.patch"
+  "$_preck2/a79d648fcde72fc98048d4435bc86864a59fd01b.patch"
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -68,15 +75,20 @@ validpgpkeys=(
 )
 sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
             'SKIP'
-            '5af72b487fbcc8e7fd3f5392271490c8498ffb2048e77abaf406971a7382f8d7'
+            '2dc86272e55d31c55bdeaa47b3d44fbd6235a396e37d82c2b47aa27f6ba82ee3'
             'SKIP'
-            '25e73d0e037b7e5cd5fd59f72dda89b3a155139586aee448bf5b69d6c01cc408'
+            'a3f066921cbfb65f2fd4d1e3977989d19835396ee27aabf84700f9ba7ff9cd4b'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             '8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8'
             '44d10c573112dc2b64d39ea33c2a10fbbdd84f9877b8d736acc09b2516299474'
-            '6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd')
+            '6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd'
+            '24b74a975e61293cdd4ce37845a27f550102b0481017336e15df3334a82cef02'
+            '453ccb01d9e56ea3a33621516f0d52568e836d1932ff14e26567cc3fe2101a17'
+            'd2f59cf1c5187204eced6e53806b187e90698fcb2309955aed4020a15c659ae1'
+            '3d4d2506795c4bd914959758f5b69ccf5a4f5a21f5d4bfc87bf0aa3b4b58f4c6'
+            '0dbf2d23df0b5d023794332872b8b346d0c4994576b778396364e803acac4498')
 
 _kernelname=${pkgbase#linux}
 
@@ -91,6 +103,11 @@ prepare() {
 
   # Patch source with ck patchset
   patch -Np1 -i "../${_ckpatchname}"
+  patch -Np1 -i ../811cb391e71c1d60387dbbd6ae0bbc4e61f06acb.patch
+  patch -Np1 -i ../6bfb805cbac27b18fb4ad7537fe90dfc39e17f35.patch
+  patch -Np1 -i ../1588e6bf316231685204e358dfe172851b39fd1e.patch
+  patch -Np1 -i ../df2a75f4864b30011ab6a6f365d9378d8eafa53b.patch
+  patch -Np1 -i ../a79d648fcde72fc98048d4435bc86864a59fd01b.patch
 
   # https://bugs.archlinux.org/task/56207
   patch -Np1 -i ../0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
diff --git a/config b/config
index fd4b23274106..f9cd6f837e66 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.0-1 Kernel Configuration
+# Linux/x86 4.14.2-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -409,10 +409,13 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_IOSCHED_BFQ_SQ is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_MQ_IOSCHED_BFQ=y
+# CONFIG_MQ_BFQ_GROUP_IOSCHED is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y