Add blk-mq v10

2 files changed, 42 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3639ff585e6..1e1176284d8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-bfq-mq-git
-	pkgver = 4.13.a731bfa0349c
+	pkgver = 4.13.bb4162667e47
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = i686
@@ -16,21 +16,14 @@ pkgbase = linux-bfq-mq-git
 	source = git+https://github.com/Algodev-github/bfq-mq
 	source = https://raw.githubusercontent.com/sirlucjan/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch
 	source = https://gitlab.com/tom81094/custom-patches/raw/master/bfq-mq/tentative/T0001-Check-presence-on-tree-of-every-entity-after-every-a.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0050-blk-mq-issue-rq-directly-in-blk_mq_request_bypass_insert().patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0051-blk-mq-sched-fix-scheduler-bad-performance.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0052-blk-mq-sbitmap-introduce__sbitmap_for_each_set().patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0053-blk-mq-introduc-blk_mq_dequeue_from_ctx().patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0054-blk-mq-sched-move-actual-dispatching-into-one-helper.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0055-blk-mq-sched-improve-dispatching-from-sw-queue.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0056-blk-mq-sched-don't-dequeue-request-until-all-in->dispatch-are-flushed.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0057-blk-mq-sched-introduce-blk_mq_sched_queue_depth().patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0058-blk-mq-sched-use-q->queue_depth-as-hint-for-q->nr_requests.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0059-blk-mq-block-introduce-rqhash-helpers.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0060-blk-mq-block-move-actual-bio-merge-code-into__elv_merge.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0061-blk-mq-block-add-check-on-elevator-for-supporting-bio-merge-via-hashtable-from-blk-mq-sw-qu.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0062-blk-mq-block-introduce-last_merge-and-hash-to-blk_mq_ctx.patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0063-blk-mq-sched-refactor-blk_mq_sched_try_merge().patch
-	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v5/0064-blk-mq-improve-bio-merge-from-blk-mq-sw-queue.patch
+	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v10/0050-blk-mq-sched-dispatch-from-scheduler-only-after-progress-is-made-on->dispatch.patch
+	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v10/0051-blk-mq-sched-move-actual-dispatching-into-one-helper.patch
+	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v10/0052-blk-mq-sbitmap-introduce__sbitmap_for_each_set().patch
+	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v10/0053-blk-mq-block-kyber-check-if-there-is-request-in-ctx-in-kyber_has_work().patch
+	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v10/0054-blk-mq-introduce-get_budget-and-put_budget-in-blk_mq_ops.patch
+	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v10/0055-blk-mq-sched-improve-dispatching-from-sw-queue.patch
+	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v10/0056-blk-mq-SCSI-allow-to-pass-null-rq-to-scsi_prep_state_check().patch
+	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.13/blk-mq-v10/0057-blk-mq-SCSI-implement-get-budget-and-put_budget-for-blk-mq.patch
 	source = https://gitlab.com/tom81094/custom-patches/raw/master/bfq-mq/mailing-list/block-bfq-disable-wbt/ML2-0001-block-bfq-Disable-writeback-throttling.patch
 	source = config.i686
 	source = config.x86_64
@@ -39,21 +32,14 @@ pkgbase = linux-bfq-mq-git
 	sha256sums = SKIP
 	sha256sums = 8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8
 	sha256sums = eb3cb1a9e487c54346b798b57f5b505f8a85fd1bc839d8f00b2925e6a7d74531
-	sha256sums = 91d3a2d15ccc84de43f19a9538b4378fe7702e9e90e63207a1a519bdcc7614e4
-	sha256sums = 0f5e66a42e4985495937e6407f00b4747a35e73c31d59d0c3be61c14fb629e0e
-	sha256sums = d0f1d2478965b2a8ae7f7d65e0ed4b74315b264b87608406e6f6332f0866581c
-	sha256sums = e4454eba9f744872c67286a6b102da552191d7ac187dc50764fe85127fa5d59d
-	sha256sums = 2477a46621301f0a2b4bfdf51bcf6480bce9f86915f89b4867b92ee8d8680d62
-	sha256sums = f48be244c917c2f6f5bbc5fb335c441e3152d83cb21d80e6d2d2d14850685bb0
-	sha256sums = cdf3bdf4f90a97f1814dee15cc5c21ee455ea702f7ada44ea6b18f1eb4db022b
-	sha256sums = 1011d65e7bd36667fb82a3729a62a1e237ed9d14f92702cd30bb0ddf9d13bd63
-	sha256sums = e0060c551bd084c4a1c56d2755973c4fa0936eff74edf6226e6464d382aa894a
-	sha256sums = 89d85dcfa0253ef3a27a363987cbfd086d09f1888baaf8d537533f231422047d
-	sha256sums = 160975f33c3083e8cf9524e34d8c0dd0dd50258ce0810c065742fd7eb6cdb7a4
-	sha256sums = 89ab286aa6e0e8ccf233e2db563d78142f108467e1b6c94d4ea9a379c9ccd41b
-	sha256sums = 78c1030dfb650d92cefaeea0516f945cc5c57849d993328f97a2e358f26fe1e5
-	sha256sums = 8114b75c12cb816c68c69a7b37c87560daf8c4d1afd8eea7947e0c74c77fc342
-	sha256sums = d235d19767373cd1ddc70e1002b975f7f4df87409af560ef86d802ee61215e66
+	sha256sums = 388b210b15913d6e46d85d3c997d21f796957d2e3eb082ba8ffda1371eaa1f3b
+	sha256sums = ed4dec610bb99928c761dee5891b9f79770f0265678c232b0d4c1879beb73e94
+	sha256sums = 40c2bbd7abd390e0674a797d08f7624051750d38a09d4c42ddba1f8341bb362a
+	sha256sums = f41ffe7388b9728061fe76c303afeb074237c4016b9e802f11e99e14d42f3a97
+	sha256sums = 2ddcc73b67f3c9ba441298650a86738efbc50fb0f79be6bc5a78e5de5cda9a0b
+	sha256sums = cfe7d6be0c243bcf6e30f1145991424ad3fa90d43bda214e0df613de007699b6
+	sha256sums = 19dd49fd6c50ac74074b354898d6aaf0c1da30e85c4f5770fdb54195b49277b0
+	sha256sums = 7c51d0053053a3a0f6ed8759a5464ed5a3275a9dd832513a5678c3bcead9e5d5
 	sha256sums = 5e57c8d1d87a63e1c5947aba02346862992f39be2b2761ea142b3897995495aa
 	sha256sums = 253a4225171213cbca0eaf28113b6b797aeac8a88766fdcfee0f1fbe5359b5b6
 	sha256sums = 97c59875e8f9eab965d6bd13030e52c0328c67243f5084105a3a2131cd58734f
@@ -69,19 +55,19 @@ pkgname = linux-bfq-mq-git
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
 	optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
-	provides = linux-bfq-mq-git=4.13.a731bfa0349c
-	provides = linux=4.13.a731bfa0349c
+	provides = linux-bfq-mq-git=4.13.bb4162667e47
+	provides = linux=4.13.bb4162667e47
 	backup = etc/mkinitcpio.d/linux-bfq-mq-git.preset
 
 pkgname = linux-bfq-mq-git-headers
 	pkgdesc = Header files and scripts for building modules for Linux-bfq-mq-git kernel
-	depends = linux-bfq-mq-git=4.13.a731bfa0349c
-	provides = linux-bfq-mq-git-headers=4.13.a731bfa0349c
-	provides = linux-headers=4.13.a731bfa0349c
+	depends = linux-bfq-mq-git=4.13.bb4162667e47
+	provides = linux-bfq-mq-git-headers=4.13.bb4162667e47
+	provides = linux-headers=4.13.bb4162667e47
 
 pkgname = linux-bfq-mq-git-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-bfq-mq-git kernel
-	depends = linux-bfq-mq-git=4.13.a731bfa0349c
-	provides = linux-bfq-mq-git-docs=4.13.a731bfa0349c
-	provides = linux-docs=4.13.a731bfa0349c
+	depends = linux-bfq-mq-git=4.13.bb4162667e47
+	provides = linux-bfq-mq-git-docs=4.13.bb4162667e47
+	provides = linux-docs=4.13.bb4162667e47
 
diff --git a/PKGBUILD b/PKGBUILD
index 045359c02913..193123eaff4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -70,7 +70,7 @@ _kyber_disable=
 pkgbase=linux-bfq-mq-git
 _pkgver=4.13
 _srcname=bfq-mq
-pkgver=4.13.a731bfa0349c
+pkgver=4.13.bb4162667e47
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -105,21 +105,14 @@ source=(# bfq-mq repository
         #"${_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}/blk-mq-v5/0050-blk-mq-issue-rq-directly-in-blk_mq_request_bypass_insert().patch"
-        "${_lucjanpath}/blk-mq-v5/0051-blk-mq-sched-fix-scheduler-bad-performance.patch"
-        "${_lucjanpath}/blk-mq-v5/0052-blk-mq-sbitmap-introduce__sbitmap_for_each_set().patch"
-        "${_lucjanpath}/blk-mq-v5/0053-blk-mq-introduc-blk_mq_dequeue_from_ctx().patch"
-        "${_lucjanpath}/blk-mq-v5/0054-blk-mq-sched-move-actual-dispatching-into-one-helper.patch"
-        "${_lucjanpath}/blk-mq-v5/0055-blk-mq-sched-improve-dispatching-from-sw-queue.patch"
-        "${_lucjanpath}/blk-mq-v5/0056-blk-mq-sched-don't-dequeue-request-until-all-in->dispatch-are-flushed.patch"
-        "${_lucjanpath}/blk-mq-v5/0057-blk-mq-sched-introduce-blk_mq_sched_queue_depth().patch"
-        "${_lucjanpath}/blk-mq-v5/0058-blk-mq-sched-use-q->queue_depth-as-hint-for-q->nr_requests.patch"
-        "${_lucjanpath}/blk-mq-v5/0059-blk-mq-block-introduce-rqhash-helpers.patch"
-        "${_lucjanpath}/blk-mq-v5/0060-blk-mq-block-move-actual-bio-merge-code-into__elv_merge.patch"
-        "${_lucjanpath}/blk-mq-v5/0061-blk-mq-block-add-check-on-elevator-for-supporting-bio-merge-via-hashtable-from-blk-mq-sw-qu.patch"
-        "${_lucjanpath}/blk-mq-v5/0062-blk-mq-block-introduce-last_merge-and-hash-to-blk_mq_ctx.patch"
-        "${_lucjanpath}/blk-mq-v5/0063-blk-mq-sched-refactor-blk_mq_sched_try_merge().patch"
-        "${_lucjanpath}/blk-mq-v5/0064-blk-mq-improve-bio-merge-from-blk-mq-sw-queue.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"
+        "${_lucjanpath}/blk-mq-v10/0053-blk-mq-block-kyber-check-if-there-is-request-in-ctx-in-kyber_has_work().patch"
+        "${_lucjanpath}/blk-mq-v10/0054-blk-mq-introduce-get_budget-and-put_budget-in-blk_mq_ops.patch"
+        "${_lucjanpath}/blk-mq-v10/0055-blk-mq-sched-improve-dispatching-from-sw-queue.patch"
+        "${_lucjanpath}/blk-mq-v10/0056-blk-mq-SCSI-allow-to-pass-null-rq-to-scsi_prep_state_check().patch"
+        "${_lucjanpath}/blk-mq-v10/0057-blk-mq-SCSI-implement-get-budget-and-put_budget-for-blk-mq.patch"
         # mailing-list (ML2) patches
         "${_mlpath_2}/ML2-0001-block-bfq-Disable-writeback-throttling.patch"
         # the main kernel config files
@@ -131,21 +124,14 @@ source=(# bfq-mq repository
 sha256sums=('SKIP'
             '8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8'
             'eb3cb1a9e487c54346b798b57f5b505f8a85fd1bc839d8f00b2925e6a7d74531'
-            '91d3a2d15ccc84de43f19a9538b4378fe7702e9e90e63207a1a519bdcc7614e4'
-            '0f5e66a42e4985495937e6407f00b4747a35e73c31d59d0c3be61c14fb629e0e'
-            'd0f1d2478965b2a8ae7f7d65e0ed4b74315b264b87608406e6f6332f0866581c'
-            'e4454eba9f744872c67286a6b102da552191d7ac187dc50764fe85127fa5d59d'
-            '2477a46621301f0a2b4bfdf51bcf6480bce9f86915f89b4867b92ee8d8680d62'
-            'f48be244c917c2f6f5bbc5fb335c441e3152d83cb21d80e6d2d2d14850685bb0'
-            'cdf3bdf4f90a97f1814dee15cc5c21ee455ea702f7ada44ea6b18f1eb4db022b'
-            '1011d65e7bd36667fb82a3729a62a1e237ed9d14f92702cd30bb0ddf9d13bd63'
-            'e0060c551bd084c4a1c56d2755973c4fa0936eff74edf6226e6464d382aa894a'
-            '89d85dcfa0253ef3a27a363987cbfd086d09f1888baaf8d537533f231422047d'
-            '160975f33c3083e8cf9524e34d8c0dd0dd50258ce0810c065742fd7eb6cdb7a4'
-            '89ab286aa6e0e8ccf233e2db563d78142f108467e1b6c94d4ea9a379c9ccd41b'
-            '78c1030dfb650d92cefaeea0516f945cc5c57849d993328f97a2e358f26fe1e5'
-            '8114b75c12cb816c68c69a7b37c87560daf8c4d1afd8eea7947e0c74c77fc342'
-            'd235d19767373cd1ddc70e1002b975f7f4df87409af560ef86d802ee61215e66'
+            '388b210b15913d6e46d85d3c997d21f796957d2e3eb082ba8ffda1371eaa1f3b'
+            'ed4dec610bb99928c761dee5891b9f79770f0265678c232b0d4c1879beb73e94'
+            '40c2bbd7abd390e0674a797d08f7624051750d38a09d4c42ddba1f8341bb362a'
+            'f41ffe7388b9728061fe76c303afeb074237c4016b9e802f11e99e14d42f3a97'
+            '2ddcc73b67f3c9ba441298650a86738efbc50fb0f79be6bc5a78e5de5cda9a0b'
+            'cfe7d6be0c243bcf6e30f1145991424ad3fa90d43bda214e0df613de007699b6'
+            '19dd49fd6c50ac74074b354898d6aaf0c1da30e85c4f5770fdb54195b49277b0'
+            '7c51d0053053a3a0f6ed8759a5464ed5a3275a9dd832513a5678c3bcead9e5d5'
             '5e57c8d1d87a63e1c5947aba02346862992f39be2b2761ea142b3897995495aa'
             '253a4225171213cbca0eaf28113b6b797aeac8a88766fdcfee0f1fbe5359b5b6'
             '97c59875e8f9eab965d6bd13030e52c0328c67243f5084105a3a2131cd58734f'