upgpkg to upstream 4.12.6 with refreshed patches

1 files changed, 22 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 11f1f362b9d7..e4a3c229496f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -58,10 +58,10 @@ _kyber_disable=
 
 pkgbase=linux-bfq-mq
 #pkgbase=linux-custom       # Build kernel with a different name
-pkgver=4.12.5
+pkgver=4.12.6
 _srcpatch="${pkgver##*\.*\.}"
 _srcname="linux-${pkgver%%\.${_srcpatch}}"
-pkgrel=5
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/Algodev-github/bfq-mq/"
 license=('GPL2')
@@ -78,17 +78,15 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
         "http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz"
         # mainline block merges and bfq-mq patches
-        "${_mergepath}/0001-Merge-tag-uuid-for-4.13-of-git-git.infradead.org-use.patch"
-        "${_mergepath}/0002-Merge-branch-for-4.13-block-of-git-git.kernel.dk-lin.patch"
-        "${_mergepath}/0003-Merge-branch-irq-core-for-linus-of-git-git.kernel.or.patch"
-        "${_mergepath}/0004-Merge-tag-uuid-for-4.13-of-git-git.infradead.org-use.patch"
-        "${_mergepath}/0005-Merge-branch-for-linus-of-git-git.kernel.org-pub-scm.patch"
-        "${_mergepath}/0006-Merge-tag-for-linus-v4.13-2-of-git-git.kernel.org-pu.patch"
-        "${_mergepath}/0007-Merge-branch-for-linus-of-git-git.kernel.dk-linux-bl.patch"
-        "${_mergepath}/0008-Merge-tag-mmc-v4.13-2-of-git-git.kernel.org-pub-scm-.patch"
-        "${_mergepath}/0009-Merge-branch-for-linus-of-git-git.kernel.dk-linux-bl.patch"
-        "${_mergepath}/0010-Merge-tag-uuid-for-4.13-2-of-git-git.infradead.org-u.patch"
-        "${_mergepath}/0011-Merge-branch-for-linus-of-git-git.kernel.dk-linux-bl.patch"
+        "${_mergepath}/0001-Merge-tag-uuid-for-4.13-of-uuid.patch"
+        "${_mergepath}/0002-Merge-branch-for-4.13-block-of-linux-block.patch"
+        "${_mergepath}/0003-Merge-branch-irq-core-for-linus.patch"
+        "${_mergepath}/0004-Merge-branch-for-linus-of-s390.patch"
+        "${_mergepath}/0005-Merge-tag-for-linus-v4.13-2-of-linux-block.patch"
+        "${_mergepath}/0006-Merge-branch-for-linus-of-linux-block_1.patch"
+        "${_mergepath}/0007-Merge-branch-for-linus-of-linux-block_2.patch"
+        "${_mergepath}/0008-Merge-tag-uuid-for-4.13-2-of-uuid.patch"
+        "${_mergepath}/0009-Merge-branch-for-linus-of-linux-block_3.patch"
         "${_bfqpath}/${_bfq_mq_patch}"
         # tentative patches
         "${_bfqpath}/tentative/T0001-Check-presence-on-tree-of-every-entity-after-every-a.patch"
@@ -101,20 +99,18 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
 
 sha256sums=('a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab'
             'SKIP'
-            '8eb42889cd1f41a4350a0227e0dae544acdfa0ddf5a5ec671dd9c64ca917c132'
+            '60938af0f95ae794f879294f2393c48077c01bdba851e80b085fdc0418eeca44'
             'SKIP'
             '0f3e4930c3a603cc99fffa9fcac0f2cf7c58fc14a7ef8557345358c0bcd2bf66'
-            'ac6e5af03c5d3f7fe00b412864024ad577966b080ab5ca92a19521f08dacf809'
-            '03a711ad66741318938e7aab33e10d7538cee9371072b8ddb3545b6344e8178d'
-            'e2662728380052385a9a5a451e9d411843fa34be8cbf40fb85c134d1f8186d7c'
-            '7f1fe5657b6aa0cdcc2d8eac1ef98f7a806cfbe8a4841c109d969fea292bb5f0'
-            'c0e2e01d43bb74a7a97c4261c2aeb74d7f2e54cba6e140115381f65a88e82ab9'
-            '719d7c983f1b84016d1dd451a4ae863f78af00db8a9f8143c14dcc37064a9128'
-            '745a6e098f55e89959662e3618d2815733f1a9bcab4070223b655376c2c05daf'
-            '53545d0baf82f103ca78f314b7ed720cecabb7a36e204b71c576e25403aa8943'
-            'c1ce412c7a49ba585ba2dea63f887959e5215af4da34faeba5c4d636ba180c7d'
-            '3713a3a626ca83d611bd93d0fa6ed9904df8e6ccd9ba6c1a6cbd83d2211aa00c'
-            '03c2b3917045fb3237f41842c5624c099ec98a503fa250aadfe2673f3937e8e8'
+            'b8745ca529c03c1d20473cb45cda3ea25da49a73e522cd834c32b9316b5f9f12'
+            '497a268278e9ebf27ce104bfa9e483686d3285fb8e96e8cd09774042cd8a7c45'
+            'b029d1cc6c26c7148ffbe753bc959f774a49d4195e3b9b5926e2631f50cf6ef6'
+            'e7cba5ea08ca33644548a856c8014ec633021c5ad7a0ada3fe3567da94dd5cdf'
+            'b863c975168c38576fe7900a521a4d2795e5cd8b39626814191e00d4258cdd1b'
+            '6d2c59f99f1ec0889ef16bf8017c6be0b09c7e7a388258198ecff92036167456'
+            '284c7f88b3a3b8ec5219bf0fefd21f5b8d8970e1db64e49c135e8764856f27d3'
+            '64cfcd89fd567c68cdff0ef1b76d71427bef9f4b81f909453338cc02366282b2'
+            'e3d2f946b9e097415afb31d57bb0ff4d900af83259ac0819243c7a8aa1aba1a1'
             'ff9168cec9ff78f5c728fd183e456dcfc6c7077c847d74a67e5d8b5a2266d67b'
             'eb3cb1a9e487c54346b798b57f5b505f8a85fd1bc839d8f00b2925e6a7d74531'
             '1ec464d33d8e4c1abe50adb0e38152f93c89967c6a8537ffe9d4f1fbab647a59'
@@ -149,7 +145,7 @@ prepare() {
     patch -Np1 -i "$p"
   done
 
-  msg "-> Apply bfq-mq patch"
+  msg "-> Apply BFQ-MQ patch"
   patch -Np1 -i "${srcdir}/${_bfq_mq_patch}"
 
   # Patches related to BUG_ON(entity->tree && entity->tree != &st->active) in __bfq_requeue_entity();