Update to 4.6.5-1

3 files changed, 27 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 587d2556a8f5..31ad94e99f31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Mon Jul 11 20:49:25 UTC 2016
+# Wed Jul 27 18:21:15 UTC 2016
 pkgbase = linux-ck
-	pkgver = 4.6.4
+	pkgver = 4.6.5
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = i686
@@ -14,32 +14,32 @@ pkgbase = linux-ck
 	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 = config.x86_64
 	source = config
 	source = linux-ck.preset
 	source = change-default-console-loglevel.patch
-	source = 0001-linux-4.6-rtlwifi-fix-atomic.patch
 	source = http://ck.kolivas.org/patches/4.0/4.6/4.6-ck1/patch-4.6-ck1.xz
 	source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
-	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
 	sha256sums = a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866
 	sha256sums = SKIP
-	sha256sums = f500a3b841c41420914938d681e258c712fbbd7ebec5fe70f0abc071a1738e47
+	sha256sums = 857df33f085a0116b9d2322ffe3b23d5b7d8c4898427d79f68108a653e84910c
 	sha256sums = SKIP
 	sha256sums = 8fea5fed21eabd29befb70fc0f1eea6d92c6a4d9c16b039229b0b6b9322fe8ee
 	sha256sums = a1d7dc1d00baf54b623806dd5adc203ed2d215552b8f5f954f08f5bf47af3626
 	sha256sums = 2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
-	sha256sums = ae0d16e81a915fae130125ba9d0b6fd2427e06f50b8b9514abc4029efe61ee98
 	sha256sums = 4475edebbcac102e5d92921970c12b22482c08069cc1478a7c922453611e0871
 	sha256sums = cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791
-	sha256sums = 5d19ecb91320a64f0abb6c8e70205fef848ada967093faa94e4c0c39c340d0c8
-	sha256sums = 9c1e11772ff29d37dacc9246f63e24d5154eb61682ba2b7e175a9ccbdc7116e1
-	sha256sums = e0c9474431b60ca9fc3da04e7610748219da143440f1d7f5152572c7c63b52e0
+	sha256sums = 1857e05fd79baffc04dd075be81257d0a43351c244b7f360b48408a28ecfde2d
+	sha256sums = 595887ea141ee7373460d325368f362ca87695259b9bca3499f12ef76322172b
+	sha256sums = d90d5525e3b4fefbd218e04b09c2234700226ecd8a350e8d88a3145c02b82c18
+	sha256sums = 411e6f7aacc24d869f8b697e514bcbe1bb8ac676a73710269d4f8b516ce0b971
 
 pkgname = linux-ck
 	pkgdesc = Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.470.
@@ -50,7 +50,7 @@ pkgname = linux-ck
 	optdepends = crda: to set the correct wireless channels of your country
 	optdepends = nvidia-ck: nVidia drivers for linux-ck
 	optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
-	provides = linux-ck=4.6.4
+	provides = linux-ck=4.6.5
 	conflicts = kernel26-ck
 	conflicts = linux-ck-corex
 	conflicts = linux-ck-p4
@@ -75,8 +75,8 @@ pkgname = linux-ck
 pkgname = linux-ck-headers
 	pkgdesc = Header files and scripts to build modules for linux-ck.
 	depends = linux-ck
-	provides = linux-ck-headers=4.6.4
-	provides = linux-headers=4.6.4
+	provides = linux-ck-headers=4.6.5
+	provides = linux-headers=4.6.5
 	conflicts = kernel26-ck-headers
 	conflicts = linux-ck-corex-headers
 	conflicts = linux-ck-p4-headers
diff --git a/0001-linux-4.6-rtlwifi-fix-atomic.patch b/0001-linux-4.6-rtlwifi-fix-atomic.patch
deleted file mode 100644
index e514ec85f906..000000000000
--- a/0001-linux-4.6-rtlwifi-fix-atomic.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From de26859dcf363d520cc44e59f6dcaf20ebe0aadf Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Sat, 21 May 2016 11:50:35 -0500
-Subject: rtlwifi: Fix scheduling while atomic error from commit 49f86ec21c01
-
-Commit 49f86ec21c01 ("rtlwifi: Change long delays to sleeps") was correct
-for most cases; however, driver rtl8192ce calls the affected routines while
-in atomic context. The kernel bug output is as follows:
-
-BUG: scheduling while atomic: wpa_supplicant/627/0x00000002
-[...]
-  [<ffffffff815c2b39>] __schedule+0x899/0xad0
-  [<ffffffff815c2dac>] schedule+0x3c/0x90
-  [<ffffffff815c5bb2>] schedule_hrtimeout_range_clock+0xa2/0x120
-  [<ffffffff810e8b80>] ? hrtimer_init+0x120/0x120
-  [<ffffffff815c5ba6>] ? schedule_hrtimeout_range_clock+0x96/0x120
-  [<ffffffff815c5c43>] schedule_hrtimeout_range+0x13/0x20
-  [<ffffffff815c568f>] usleep_range+0x4f/0x70
-  [<ffffffffa0667218>] rtl_rfreg_delay+0x38/0x50 [rtlwifi]
-  [<ffffffffa06dd0e7>] rtl92c_phy_config_rf_with_headerfile+0xc7/0xe0 [rtl8192ce]
-
-To fix this bug, three of the changes from delay to sleep are reverted.
-Unfortunately, one of the changes involves a delay of 50 msec. The calling
-code will be modified so that this long delay can be avoided; however,
-this change is being pushed now to fix the problem in kernel 4.6.0.
-
-Fixes: 49f86ec21c01 ("rtlwifi: Change long delays to sleeps")
-Reported-by: James Feeney <james@nurealm.net>
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-Cc: James Feeney <james@nurealm.net>
-Cc: Stable <stable@vger.kernel.org> [4.6+]
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/net/wireless/realtek/rtlwifi/core.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
-index 0f48048..3a0faa8 100644
---- a/drivers/net/wireless/realtek/rtlwifi/core.c
-+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
-@@ -54,7 +54,7 @@ EXPORT_SYMBOL(channel5g_80m);
- void rtl_addr_delay(u32 addr)
- {
- 	if (addr == 0xfe)
--		msleep(50);
-+		mdelay(50);
- 	else if (addr == 0xfd)
- 		msleep(5);
- 	else if (addr == 0xfc)
-@@ -75,7 +75,7 @@ void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
- 		rtl_addr_delay(addr);
- 	} else {
- 		rtl_set_rfreg(hw, rfpath, addr, mask, data);
--		usleep_range(1, 2);
-+		udelay(1);
- 	}
- }
- EXPORT_SYMBOL(rtl_rfreg_delay);
-@@ -86,7 +86,7 @@ void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data)
- 		rtl_addr_delay(addr);
- 	} else {
- 		rtl_set_bbreg(hw, addr, MASKDWORD, data);
--		usleep_range(1, 2);
-+		udelay(1);
- 	}
- }
- EXPORT_SYMBOL(rtl_bb_delay);
--- 
-cgit v0.12
-
diff --git a/PKGBUILD b/PKGBUILD
index 766647dc3279..50d7466c9d0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,7 +52,7 @@ _BFQ_enable_=
 pkgname=(linux-ck linux-ck-headers)
 _kernelname=-ck
 _srcname=linux-4.6
-pkgver=4.6.4
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -62,7 +62,7 @@ options=('!strip')
 _ckpatchversion=1
 _ckpatchname="patch-4.6-ck${_ckpatchversion}"
 _gcc_patch="enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch"
-_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.5.0-v7r11"
+_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8"
 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"
 "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
@@ -70,29 +70,29 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
 'config.x86_64' 'config'
 'linux-ck.preset'
 'change-default-console-loglevel.patch'
-'0001-linux-4.6-rtlwifi-fix-atomic.patch'
 # ck1
 "http://ck.kolivas.org/patches/4.0/4.6/4.6-ck${_ckpatchversion}/${_ckpatchname}.xz"
 # gcc
 "http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz"
 # bfq
-"${_bfqpath}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch"
-"${_bfqpath}/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch"
-"${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch")
+"${_bfqpath}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.6.0.patch"
+"${_bfqpath}/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.6.0.patch"
+"${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch"
+"${_bfqpath}/0004-blkck-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8-for-4.patch")
 sha256sums=('a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866'
             'SKIP'
-            'f500a3b841c41420914938d681e258c712fbbd7ebec5fe70f0abc071a1738e47'
+            '857df33f085a0116b9d2322ffe3b23d5b7d8c4898427d79f68108a653e84910c'
             'SKIP'
             '8fea5fed21eabd29befb70fc0f1eea6d92c6a4d9c16b039229b0b6b9322fe8ee'
             'a1d7dc1d00baf54b623806dd5adc203ed2d215552b8f5f954f08f5bf47af3626'
             '2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            'ae0d16e81a915fae130125ba9d0b6fd2427e06f50b8b9514abc4029efe61ee98'
             '4475edebbcac102e5d92921970c12b22482c08069cc1478a7c922453611e0871'
             'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791'
-            '5d19ecb91320a64f0abb6c8e70205fef848ada967093faa94e4c0c39c340d0c8'
-            '9c1e11772ff29d37dacc9246f63e24d5154eb61682ba2b7e175a9ccbdc7116e1'
-            'e0c9474431b60ca9fc3da04e7610748219da143440f1d7f5152572c7c63b52e0')
+            '1857e05fd79baffc04dd075be81257d0a43351c244b7f360b48408a28ecfde2d'
+            '595887ea141ee7373460d325368f362ca87695259b9bca3499f12ef76322172b'
+            'd90d5525e3b4fefbd218e04b09c2234700226ecd8a350e8d88a3145c02b82c18'
+            '411e6f7aacc24d869f8b697e514bcbe1bb8ac676a73710269d4f8b516ce0b971')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -109,10 +109,6 @@ prepare() {
 	# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
 	patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-	# fix rtlwifi atomic
-	# https://bugs.archlinux.org/task/49401
-	patch -p1 -i "${srcdir}/0001-linux-4.6-rtlwifi-fix-atomic.patch"
-
 	# patch source with ck patchset with BFS
 	# fix double name in EXTRAVERSION
 	sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "${srcdir}/${_ckpatchname}"