Bump to 4.2.2

1 files changed, 3 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2b1a3c786f98..f79cce06f932 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,7 +52,7 @@ pkgbase=linux-bfq
 pkgname=('linux-bfq' 'linux-bfq-headers' 'linux-bfq-docs')
 _kernelname=-bfq
 _srcname=linux-4.2
-pkgver=4.2.1
+pkgver=4.2.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://algo.ing.unimo.it"
@@ -75,7 +75,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'linux-bfq.preset'
         'change-default-console-loglevel.patch'
         'config' 'config.x86_64'
-        '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')
@@ -87,11 +86,6 @@ prepare() {
         msg "Add upstream patch"
         patch -Np1 -i "${srcdir}/patch-${pkgver}"
         
-    ### Fix work_queue symbol to non GPL for nvidia module building
-     # already applied to 4.3 series
-        msg "Fix work_queue symbol to non GPL for nvidia module building"
-        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
         msg "Fix hard lockup in e1000e_cyclecounter_read() after 4 hours of uptime"
@@ -457,7 +451,7 @@ package_linux-bfq-docs() {
 
 sha512sums=('a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee'
             'SKIP'
-            'e967defe3f7b1ccaa8f165195c0fea33a77c53eb3949bb020311ec86b2fd4b006c68df9573ff3114a8006742ff1219dc3b6f4ebc1283155625d9437f823d02bf'
+            'b37c71cb46cdbf3b7d2dac84ebf3e09d4e5e2433b150078e0e40ea881296401954b359d7bba6e9358957260cb0ccabafc0579feaef19c949d02ac9cfb48a3002'
             'SKIP'
             '077f2c0d5b8e43b295ae52d9b742dc5a7119765016725e4997d0a7cd7941a7622ac057f9bae4b8ed284499853334984f462afbb72ac492806f9657b39ff8503c'
             'a3722869b6bc046a9969efea3c20d96a79ba786a6ce6a834adb70c32453f0c0dac58a456daa842beae53628a30868088efde566be91c7821b74946f2f8dd9c60'
@@ -467,11 +461,11 @@ sha512sums=('a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf
             'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8'
             'f8fedf212f655b4241c9aa4b1161b55ef8f67754b278b46714767819206286d6cee3425268df92aa05cd699b01cc4df72266cc7ba5af7da2986bbdef91c90993'
             'b778ce82f1a8b99b883e802136dc8d3248197198f777e4f96cb1e1ea0990250d88141771f6e6e0139e034e63856f0ae82ef5e470eab64e368278e54fb6e62930'
-            '0eaa8ffd523ec0cd101fb77f2686474fcae6a705ee457257d8eaf20a3da6af79180b225c157591f17bc55035cd94c9eae3c789f504bc9226efb5d3aaa569b229'
             '790f82eb281d698db6d3b599a0dcece93345c183a6ebe4478d3e17fa916a2a6d763e89058543b32a87beddab37924078c618e8de1bd3cbcc0747be681be3349b'
             '151f797ee9c7756bf711422e47482644072988803fa894e62d34ec8d85375e5097dbdc70eecfb7ac8b0d813c634e043a522dba6e3155424013537939cdc931da'
             'df396cf09a42b1ce1cbf5e611d9322e6136f47a033131f77533efdc678f70e8d91dd7ce8a6050bc3b6e30d82a8ccc3f53e677079d813c1ae0d22b4b6c2746c44')
 
+
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman