Update to 4.2.2.

2 files changed, 8 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4552bd15fd7e..d247dac1fed1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-bld
-	pkgver = 4.2.1
+	pkgver = 4.2.2
 	pkgrel = 1
 	url = https://github.com/rmullick/linux
 	arch = i686
@@ -11,8 +11,8 @@ pkgbase = linux-bld
 	options = !strip
 	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.sign
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.1.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.1.sign
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.2.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.2.sign
 	source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
 	source = config
 	source = config.x86_64
@@ -22,12 +22,11 @@ pkgbase = linux-bld
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.2.0-v7r9/0002-block-introduce-the-BFQ-v7r9-I-O-sched-for-4.2.patch
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.2.0-v7r9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r9-for-4.2.0.patch
 	source = https://raw.githubusercontent.com/rmullick/bld-patches/master/BLD-4.2.patch
-	source = 0001-make_flush_workqueue_non_gpl.patch
 	source = 0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch
 	source = 0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch
 	sha256sums = cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb
 	sha256sums = SKIP
-	sha256sums = 9d0ab6525eb5f42056e2465267c62fa67efc75c57ad5345b99414b783278e9a3
+	sha256sums = 8b4578f1e1dcfbef1e39c39b861d4715aa99917af0b7c2dc324622d65884dcb5
 	sha256sums = SKIP
 	sha256sums = 819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532
 	sha256sums = e6f6f804f98ad321ce3e4395924993b51decb89699fde369391ccbb4bae928b2
@@ -38,7 +37,6 @@ pkgbase = linux-bld
 	sha256sums = 743ecc34ab048581e9998c53b1eb81c1c31d3ac9ee72d04e1e00b2bafeedbddc
 	sha256sums = 8d9cc296721fc4d6273ee9c7609b7d815e4061c360231eb68d060b4b7e7b7f81
 	sha256sums = 40c76861b95b8fc69daf48d69dbd5abb8c0be23c9c2ac1e208c4303e6f03f016
-	sha256sums = 4e776734e2c2185910a6fbb6f333d967b04f4a72b3196310af286c6a779bd97d
 	sha256sums = 0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b
 	sha256sums = 6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3
 
@@ -50,14 +48,14 @@ pkgname = linux-bld
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = kernel26-bld=4.2.1
+	provides = kernel26-bld=4.2.2
 	conflicts = kernel26-bld
 	replaces = kernel26-bld
 	backup = etc/mkinitcpio.d/linux-bld.preset
 
 pkgname = linux-bld-headers
 	pkgdesc = Header files and scripts for building modules for Linux-bld kernel
-	provides = kernel26-bld-headers=4.2.1
+	provides = kernel26-bld-headers=4.2.2
 	conflicts = kernel26-bld-headers
 	replaces = kernel26-bld-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 6a44e5de0e57..7d0b7aaaed47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-bld       # Build kernel with a different name
 _srcname=linux-4.2
 pkgname=(linux-bld linux-bld-headers)
 _kernelname=-bld
-pkgver=4.2.1
+pkgver=4.2.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/rmullick/linux"
@@ -31,14 +31,13 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
 	"${_bfqpath}/0002-block-introduce-the-BFQ-v7r9-I-O-sched-for-4.2.patch"
 	"${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r9-for-4.2.0.patch"
         "https://raw.githubusercontent.com/rmullick/bld-patches/master/${_BLDpatch}"
-        '0001-make_flush_workqueue_non_gpl.patch'
         '0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch'
         '0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch'
         )
 
 sha256sums=('cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb'
             'SKIP'
-            '9d0ab6525eb5f42056e2465267c62fa67efc75c57ad5345b99414b783278e9a3'
+            '8b4578f1e1dcfbef1e39c39b861d4715aa99917af0b7c2dc324622d65884dcb5'
             'SKIP'
             '819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532'
             'e6f6f804f98ad321ce3e4395924993b51decb89699fde369391ccbb4bae928b2'
@@ -49,7 +48,6 @@ sha256sums=('cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb'
             '743ecc34ab048581e9998c53b1eb81c1c31d3ac9ee72d04e1e00b2bafeedbddc'
             '8d9cc296721fc4d6273ee9c7609b7d815e4061c360231eb68d060b4b7e7b7f81'
             '40c76861b95b8fc69daf48d69dbd5abb8c0be23c9c2ac1e208c4303e6f03f016'
-            '4e776734e2c2185910a6fbb6f333d967b04f4a72b3196310af286c6a779bd97d'
             '0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b'
             '6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3')
 
@@ -102,10 +100,6 @@ prepare() {
   done
 
   msg2 "Patches from Archlinux"
-  # fix work_queue symbol to non GPL for nvidia module building
-  # already applied to 4.3 series
-  patch -p1 -i "${srcdir}/0001-make_flush_workqueue_non_gpl.patch"
-
   # fix hard lockup in e1000e_cyclecounter_read() after 4 hours of uptime
   # https://lkml.org/lkml/2015/8/18/292
   patch -p1 -i "${srcdir}/0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch"