From fc0197b270e923c2e27e5af0f240bceb3415b6ed Mon Sep 17 00:00:00 2001
From: Dan Ziemba <zman0900@gmail.com>
Date: Fri, 2 Oct 2015 22:08:17 -0400
Subject: [PATCH] 4.2.2

---
 .SRCINFO | 10 ++++------
 PKGBUILD | 10 ++--------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 4668764..b8f5590 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-vfio
-	pkgver = 4.2.1
+	pkgver = 4.2.2
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = i686
@@ -13,13 +13,12 @@ pkgbase = linux-vfio
 	options = !strip
 	source = https://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 = https://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 = https://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 = config
 	source = config.x86_64
 	source = linux.preset
 	source = change-default-console-loglevel.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
 	source = 0001-fix-bridge-regression.patch
@@ -27,13 +26,12 @@ pkgbase = linux-vfio
 	source = i915_317.patch
 	sha256sums = cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb
 	sha256sums = SKIP
-	sha256sums = 9d0ab6525eb5f42056e2465267c62fa67efc75c57ad5345b99414b783278e9a3
+	sha256sums = 8b4578f1e1dcfbef1e39c39b861d4715aa99917af0b7c2dc324622d65884dcb5
 	sha256sums = SKIP
 	sha256sums = e6f6f804f98ad321ce3e4395924993b51decb89699fde369391ccbb4bae928b2
 	sha256sums = a071aaa327d2b3577fa4709b47ed5fe81c7914d168607f3db905fdbf226247e7
 	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
-	sha256sums = 4e776734e2c2185910a6fbb6f333d967b04f4a72b3196310af286c6a779bd97d
 	sha256sums = 0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b
 	sha256sums = 6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3
 	sha256sums = 0a8fe4434e930d393c7983e335842f6cb77ee263af5592a0ca7e14bae7296183
diff --git a/PKGBUILD b/PKGBUILD
index cd4595d..698dca9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=linux-vfio
 _srcname=linux-4.2
-pkgver=4.2.1
+pkgver=4.2.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -18,7 +18,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
-        '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'
         '0001-fix-bridge-regression.patch'
@@ -27,13 +26,12 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         )
 sha256sums=('cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb'
             'SKIP'
-            '9d0ab6525eb5f42056e2465267c62fa67efc75c57ad5345b99414b783278e9a3'
+            '8b4578f1e1dcfbef1e39c39b861d4715aa99917af0b7c2dc324622d65884dcb5'
             'SKIP'
             'e6f6f804f98ad321ce3e4395924993b51decb89699fde369391ccbb4bae928b2'
             'a071aaa327d2b3577fa4709b47ed5fe81c7914d168607f3db905fdbf226247e7'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '4e776734e2c2185910a6fbb6f333d967b04f4a72b3196310af286c6a779bd97d'
             '0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b'
             '6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3'
             '0a8fe4434e930d393c7983e335842f6cb77ee263af5592a0ca7e14bae7296183'
@@ -55,10 +53,6 @@ prepare() {
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
-  # 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"