Bump to 4.13-bfq-sq-mq-git-20171111 && fix patching error with 4.13.X

1 files changed, 8 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f8fd63d609ea..e8b6bd7f470b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -68,7 +68,7 @@ pkgbase=linux-bfq-mq
 pkgver=4.13.12
 _srcpatch="${pkgver##*\.*\.}"
 _srcname="linux-${pkgver%%\.${_srcpatch}}"
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://github.com/Algodev-github/bfq-mq/"
 license=('GPL2')
@@ -82,7 +82,7 @@ _lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13"
 #_lucjanpath="https://raw.githubusercontent.com/sirlucjan/kernel-patches/master/4.13"
 _bfqgroup="https://groups.google.com/group/bfq-iosched/attach"
 _gcc_patch='enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch'
-_bfq_mq_ver='20171030'
+_bfq_mq_ver='20171111'
 _bfq_mq_patch="4.13-bfq-sq-mq-git-${_bfq_mq_ver}.patch"
 source=(# mainline kernel patches
         "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
@@ -111,6 +111,7 @@ source=(# mainline kernel patches
         #"${_mlpath_1}/ML1-0012-block-introduce-.last_merge-and-.hash-to-blk_mq_ctx.patch"
         #"${_mlpath_1}/ML1-0013-blk-mq-sched-refactor-blk_mq_sched_try_merge.patch"
         #"${_mlpath_1}/ML1-0014-blk-mq-improve-bio-merge-from-blk-mq-sw-queue.patch"
+        "${_lucjanpath}/0001-bfq-sq-mq-fix-patching-error-with-20171109.patch"
         "${_lucjanpath}/blk-mq-v10/0050-blk-mq-sched-dispatch-from-scheduler-only-after-progress-is-made-on->dispatch.patch"
         "${_lucjanpath}/blk-mq-v10/0051-blk-mq-sched-move-actual-dispatching-into-one-helper.patch"
         "${_lucjanpath}/blk-mq-v10/0052-blk-mq-sbitmap-introduce__sbitmap_for_each_set().patch"
@@ -133,8 +134,9 @@ sha256sums=('2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c'
             'd5830f31cf8522986fb530e69b3b9b023f0298c4f88d897541ff0776dc805828'
             'SKIP'
             '8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8'
-            '3673a3571bcd14bae3137783d2c0b1b3a903fbfb2cf5bc0a1123ab3f9f46e8dd'
+            '6cd1a0cd7aada3910181a547c07d6d11e7a36feedd6f529216f251741194b1bd'
             'eb3cb1a9e487c54346b798b57f5b505f8a85fd1bc839d8f00b2925e6a7d74531'
+            'd68ab3571d922337d1ff862c8fa087a20b73cc651fde99c87bd397df778d0d76'
             '388b210b15913d6e46d85d3c997d21f796957d2e3eb082ba8ffda1371eaa1f3b'
             'ed4dec610bb99928c761dee5891b9f79770f0265678c232b0d4c1879beb73e94'
             '40c2bbd7abd390e0674a797d08f7624051750d38a09d4c42ddba1f8341bb362a'
@@ -166,10 +168,11 @@ prepare() {
   msg "Fix naming schema in BFQ-MQ patch"
   sed -i -e "s|SUBLEVEL = 0|SUBLEVEL = ${_srcpatch}|g" \
       -i -e "s|PATCHLEVEL = 14|PATCHLEVEL = 13|g" \
-      -i -e "s|EXTRAVERSION = -rc7|EXTRAVERSION =|g" \
-      -i -e "s|EXTRAVERSION = -rc7-bfq-mq|EXTRAVERSION =|g" ../${_bfq_mq_patch}
+      -i -e "s|EXTRAVERSION = -rc8|EXTRAVERSION =|g" \
+      -i -e "s|EXTRAVERSION = -rc8-bfq-mq|EXTRAVERSION =|g" ../${_bfq_mq_patch}
 
   msg "-> Apply BFQ-MQ patch"
+  patch -Np1 -i ../0001-bfq-sq-mq-fix-patching-error-with-20171109.patch
   patch -Np1 -i ../${_bfq_mq_patch}
 
   ### Patches related to BUG_ON(entity->tree && entity->tree != &st->active) in __bfq_requeue_entity();