Update to 4.6.5. BFQ enabled again

2 files changed, 27 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a077d64338b..dc43e0ffa534 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Mon Jul 11 22:00:39 UTC 2016
+# Wed Jul 27 21:11:29 UTC 2016
 pkgbase = linux-bld
-	pkgver = 4.6.4
+	pkgver = 4.6.5
 	pkgrel = 1
 	url = https://github.com/rmullick/linux
 	arch = i686
@@ -16,30 +16,32 @@ pkgbase = linux-bld
 	options = !strip
 	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.6.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.6.tar.sign
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.4.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.4.sign
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.5.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.5.sign
 	source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
 	source = config
 	source = config.x86_64
 	source = linux-bld.preset
 	source = change-default-console-loglevel.patch
-	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.5.0-v7r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
-	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.5.0-v7r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
-	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.5.0-v7r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.6.0.patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.6.0.patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0004-blkck-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8-for-4.patch
 	source = https://raw.githubusercontent.com/rmullick/bld-patches/master/BLD-4.6.patch
 	source = 0001-linux-4.6-rtlwifi-fix-atomic.patch
 	sha256sums = a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866
 	sha256sums = SKIP
-	sha256sums = f500a3b841c41420914938d681e258c712fbbd7ebec5fe70f0abc071a1738e47
+	sha256sums = 857df33f085a0116b9d2322ffe3b23d5b7d8c4898427d79f68108a653e84910c
 	sha256sums = SKIP
 	sha256sums = cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791
 	sha256sums = 02e8b02e8cd10aa059917a489a9663e7f66bdf12c5ae8a1e0369bb2862da6b68
 	sha256sums = d59014b8f887c6aa9488ef5ff9bc5d4357850a979f3ff90a2999bbe24e5c6e15
 	sha256sums = 8da1d80c0bd568781568da4f669f39fed94523312b9d37477836bfa6faa9527f
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
-	sha256sums = 5d19ecb91320a64f0abb6c8e70205fef848ada967093faa94e4c0c39c340d0c8
-	sha256sums = 9c1e11772ff29d37dacc9246f63e24d5154eb61682ba2b7e175a9ccbdc7116e1
+	sha256sums = 1857e05fd79baffc04dd075be81257d0a43351c244b7f360b48408a28ecfde2d
+	sha256sums = 595887ea141ee7373460d325368f362ca87695259b9bca3499f12ef76322172b
 	sha256sums = e0c9474431b60ca9fc3da04e7610748219da143440f1d7f5152572c7c63b52e0
+	sha256sums = 411e6f7aacc24d869f8b697e514bcbe1bb8ac676a73710269d4f8b516ce0b971
 	sha256sums = f7c6dead74777b8b3f2c229556265e01205a8ac5e49f92273169511842bf69be
 	sha256sums = ae0d16e81a915fae130125ba9d0b6fd2427e06f50b8b9514abc4029efe61ee98
 
@@ -51,14 +53,14 @@ pkgname = linux-bld
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = kernel26-bld=4.6.4
+	provides = kernel26-bld=4.6.5
 	conflicts = kernel26-bld
 	replaces = kernel26-bld
 	backup = etc/mkinitcpio.d/linux-bld.preset
 
 pkgname = linux-bld-headers
 	pkgdesc = Header files and scripts for building modules for Linux-bld kernel
-	provides = kernel26-bld-headers=4.6.4
+	provides = kernel26-bld-headers=4.6.5
 	conflicts = kernel26-bld-headers
 	replaces = kernel26-bld-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 628b4b03224c..894650b6db7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=linux-bld       # Build kernel with a different name
 _srcname=linux-4.6
 pkgname=(linux-bld linux-bld-headers)
 _kernelname=-bld
-pkgver=4.6.4
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/rmullick/linux"
@@ -14,8 +14,9 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf')
 options=('!strip')
 _gcc_patch="enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch"
-_bfqversion=v7r11
-_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.5.0-${_bfqversion}"
+_bfqversion=v8
+_bfqversion_old=v7r11
+_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-${_bfqversion}"
 _BLDpatch="BLD-4.6.patch"
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
 	"https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
@@ -27,25 +28,27 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         # standard config files for mkinitcpio ramdisk
         'linux-bld.preset'
         'change-default-console-loglevel.patch'
-        "${_bfqpath}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfqversion}-4.5.0.patch"
-        "${_bfqpath}/0002-block-introduce-the-BFQ-${_bfqversion}-I-O-sched-for-4.5.0.patch"
-        "${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfqversion}-for.patch"
+        "${_bfqpath}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfqversion_old}-4.6.0.patch"
+        "${_bfqpath}/0002-block-introduce-the-BFQ-${_bfqversion_old}-I-O-sched-for-4.6.0.patch"
+        "${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfqversion_old}-for.patch"
+        "${_bfqpath}/0004-blkck-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-${_bfqversion}-for-4.patch"
         "https://raw.githubusercontent.com/rmullick/bld-patches/master/${_BLDpatch}"
         "0001-linux-4.6-rtlwifi-fix-atomic.patch"
         )
 
 sha256sums=('a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866'
             'SKIP'
-            'f500a3b841c41420914938d681e258c712fbbd7ebec5fe70f0abc071a1738e47'
+            '857df33f085a0116b9d2322ffe3b23d5b7d8c4898427d79f68108a653e84910c'
             'SKIP'
             'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791'
             '02e8b02e8cd10aa059917a489a9663e7f66bdf12c5ae8a1e0369bb2862da6b68'
             'd59014b8f887c6aa9488ef5ff9bc5d4357850a979f3ff90a2999bbe24e5c6e15'
             '8da1d80c0bd568781568da4f669f39fed94523312b9d37477836bfa6faa9527f'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '5d19ecb91320a64f0abb6c8e70205fef848ada967093faa94e4c0c39c340d0c8'
-            '9c1e11772ff29d37dacc9246f63e24d5154eb61682ba2b7e175a9ccbdc7116e1'
+            '1857e05fd79baffc04dd075be81257d0a43351c244b7f360b48408a28ecfde2d'
+            '595887ea141ee7373460d325368f362ca87695259b9bca3499f12ef76322172b'
             'e0c9474431b60ca9fc3da04e7610748219da143440f1d7f5152572c7c63b52e0'
+            '411e6f7aacc24d869f8b697e514bcbe1bb8ac676a73710269d4f8b516ce0b971'
             'f7c6dead74777b8b3f2c229556265e01205a8ac5e49f92273169511842bf69be'
             'ae0d16e81a915fae130125ba9d0b6fd2427e06f50b8b9514abc4029efe61ee98')
 
@@ -97,7 +100,7 @@ prepare() {
   patch -Np1 -i "${srcdir}/${_gcc_patch}"
 
   msg "Patching source with BFQ patches"
-  for p in $(ls ${srcdir}/000{1,2,3}-block*BFQ*.patch); do
+  for p in $(ls ${srcdir}/000{1,2,3,4}-block*BFQ*.patch); do
       patch -Np1 -i "$p"
   done