summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2015-08-03 15:48:18 -0400
committergraysky2015-08-03 15:48:18 -0400
commitedf93787bdfef6d42c8bd84fcf27bba26a750ba9 (patch)
tree1eca01ea57f761b068a0a3407bb3be82b1a428f7
parentc67326d0728d38cb3a0e84d996626b17d5368634 (diff)
downloadaur-edf93787bdfef6d42c8bd84fcf27bba26a750ba9.tar.gz
Update to 4.1.4-1
-rw-r--r--.SRCINFO20
-rw-r--r--0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch48
-rw-r--r--PKGBUILD23
-rw-r--r--bitmap-enable-booting-for-dm-md-raid1.patch83
4 files changed, 13 insertions, 161 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b8c37de97c1..ce3f247bcde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-ck
- pkgver = 4.1.3
+ pkgver = 4.1.4
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = i686
@@ -11,13 +11,11 @@ pkgbase = linux-ck
options = !strip
source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.sign
- source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.3.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.3.sign
+ source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.4.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.4.sign
source = config.x86_64
source = config
source = linux-ck.preset
- source = 0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
- source = bitmap-enable-booting-for-dm-md-raid1.patch
source = change-default-console-loglevel.patch
source = http://ck.kolivas.org/patches/4.0/4.1/4.1-ck1/patch-4.1-ck1.bz2
source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
@@ -26,13 +24,11 @@ pkgbase = linux-ck
source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch
sha256sums = caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f
sha256sums = SKIP
- sha256sums = b949517b832af2fc90c57a35e475340f32c186f391cbdbfbe0aba7720dbb0b3e
+ sha256sums = 0976127a60a950acf2796f642ac647e5231573b9a0f25703a37a50b988bf3b88
sha256sums = SKIP
sha256sums = 988297a8bee2b4e42b90f2601f28d655dd19331b8e5e573c8e5227dcd6ff46dd
sha256sums = 2bd0424b65d522d6605d979e41142aeaa406e881567ebb725f05d9ede33552af
sha256sums = 2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e
- sha256sums = 08f69d122021e1d13c31e5987c23021916a819846c47247b3f1cee2ef99d7f82
- sha256sums = 959c4d71b5dc50434eeecf3a8608758f57f111c6e999289c435b13fc8c6be5f0
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
sha256sums = d383e24325333b0045ddbfee4cfc2491ab25d9a6446094dbe0e5ad7ed3de133a
sha256sums = 819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532
@@ -41,7 +37,7 @@ pkgbase = linux-ck
sha256sums = 4f30f76adbdf49aec8d41ac27ad212734500c272f3cba594f134a7bc263820d9
pkgname = linux-ck
- pkgdesc = Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.462.
+ pkgdesc = Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.463.
install = linux-ck.install
depends = coreutils
depends = linux-firmware
@@ -49,7 +45,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.1.3
+ provides = linux-ck=4.1.4
conflicts = kernel26-ck
conflicts = linux-ck-corex
conflicts = linux-ck-p4
@@ -73,8 +69,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.1.3
- provides = linux-headers=4.1.3
+ provides = linux-ck-headers=4.1.4
+ provides = linux-headers=4.1.4
conflicts = kernel26-ck-headers
conflicts = linux-ck-corex-headers
conflicts = linux-ck-p4-headers
diff --git a/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch b/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
deleted file mode 100644
index 1d5871606e6..00000000000
--- a/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7bee8b08c428b63aa4a3765bb907602e36355378 Mon Sep 17 00:00:00 2001
-From: Chris Mason <clm@fb.com>
-Date: Tue, 14 Jul 2015 16:25:30 -0400
-Subject: [PATCH] Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on
- Apple
-
-Commit 1c8ba6d013 moved around the setup code for broadcomm chips,
-and also added btbcm_read_verbose_config() to read extra information
-about the hardware. It's returning errors on some macbooks:
-
-Bluetooth: hci0: BCM: Read verbose config info failed (-16)
-
-Which makes us error out of the setup function. Since this
-probe isn't critical to operate the chip, this patch just changes
-things to carry on when it fails.
-
-Signed-off-by: Chris Mason <clm@fb.com>
-Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-Cc: stable@vger.kernel.org # v4.1
----
- drivers/bluetooth/btbcm.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
-index 1e1a432..9ceb8ac 100644
---- a/drivers/bluetooth/btbcm.c
-+++ b/drivers/bluetooth/btbcm.c
-@@ -472,12 +472,11 @@ int btbcm_setup_apple(struct hci_dev *hdev)
-
- /* Read Verbose Config Version Info */
- skb = btbcm_read_verbose_config(hdev);
-- if (IS_ERR(skb))
-- return PTR_ERR(skb);
--
-- BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1],
-- get_unaligned_le16(skb->data + 5));
-- kfree_skb(skb);
-+ if (!IS_ERR(skb)) {
-+ BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1],
-+ get_unaligned_le16(skb->data + 5));
-+ kfree_skb(skb);
-+ }
-
- set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
-
---
-2.4.5
-
diff --git a/PKGBUILD b/PKGBUILD
index 7ab6311e23a..cb55e1ffcb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,7 +52,7 @@ _BFQ_enable_=
pkgname=(linux-ck linux-ck-headers)
_kernelname=-ck
_srcname=linux-4.1
-pkgver=4.1.3
+pkgver=4.1.4
pkgrel=1
arch=('i686' 'x86_64')
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -69,8 +69,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
'config.x86_64' 'config'
'linux-ck.preset'
-'0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch'
-'bitmap-enable-booting-for-dm-md-raid1.patch'
'change-default-console-loglevel.patch'
# ck1
"http://ck.kolivas.org/patches/4.0/4.1/4.1-ck${_ckpatchversion}/${_ckpatchname}.bz2"
@@ -82,13 +80,11 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch")
sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
'SKIP'
- 'b949517b832af2fc90c57a35e475340f32c186f391cbdbfbe0aba7720dbb0b3e'
+ '0976127a60a950acf2796f642ac647e5231573b9a0f25703a37a50b988bf3b88'
'SKIP'
'988297a8bee2b4e42b90f2601f28d655dd19331b8e5e573c8e5227dcd6ff46dd'
'2bd0424b65d522d6605d979e41142aeaa406e881567ebb725f05d9ede33552af'
'2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
- '08f69d122021e1d13c31e5987c23021916a819846c47247b3f1cee2ef99d7f82'
- '959c4d71b5dc50434eeecf3a8608758f57f111c6e999289c435b13fc8c6be5f0'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'd383e24325333b0045ddbfee4cfc2491ab25d9a6446094dbe0e5ad7ed3de133a'
'819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532'
@@ -106,15 +102,6 @@ prepare() {
# add upstream patch
patch -p1 -i "${srcdir}/patch-${pkgver}"
- # Fix bluetooth chip initialization on some macbooks (FS#45554)
- # http://marc.info/?l=linux-bluetooth&m=143690738728402&w=2
- # https://bugzilla.kernel.org/show_bug.cgi?id=100651
- patch -Np1 -i ../0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
-
- # Fix kernel oops when booting with root on RAID1 LVM (FS#45548)
- # https://bugzilla.kernel.org/show_bug.cgi?id=100491#c24
- patch -Np1 -i ../bitmap-enable-booting-for-dm-md-raid1.patch
-
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -123,7 +110,7 @@ prepare() {
# patch source with ck patchset with BFS
# fix double name in EXTRAVERSION
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "${srcdir}/${_ckpatchname}"
- msg "Patching source with ck1 including BFS v0.462 and pending patches from CK"
+ msg "Patching source with ck1 including BFS v0.463"
patch -Np1 -i "${srcdir}/${_ckpatchname}"
# Patch source to enable more gcc CPU optimizatons via the make nconfig
@@ -247,8 +234,8 @@ build() {
}
package_linux-ck() {
- pkgdesc='Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.462.'
- #_Kpkgdesc='Linux Kernel and modules with the ck1 patchset featuring the Brain Fuck Scheduler v0.462.'
+ pkgdesc='Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.463.'
+ #_Kpkgdesc='Linux Kernel and modules with the ck1 patchset featuring the Brain Fuck Scheduler v0.463.'
#pkgdesc="${_Kpkgdesc}"
depends=('coreutils' 'linux-firmware' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country' 'nvidia-ck: nVidia drivers for linux-ck' 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
diff --git a/bitmap-enable-booting-for-dm-md-raid1.patch b/bitmap-enable-booting-for-dm-md-raid1.patch
deleted file mode 100644
index 7b29e82f730..00000000000
--- a/bitmap-enable-booting-for-dm-md-raid1.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Subject: [PATCH] Enable loading of bitmaps for dm-md-raid1.
-
-This is also a temporary hack to systems with junk in the rest
-of the bitmap super (instead of zeroes) to boot. This is done by
-checking mddev->sync_super (which is exclusively set by dm-raid)
-is null.
-
-These changes also include zeroing of most bitmap pages while
-allocating so we are sure that the junk is not coming from memory.
-
-Signed-off-by: Neil Brown <neilb@suse.de>
-Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
----
-diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
-index 135a090..dfa5ef3 100644
---- a/drivers/md/bitmap.c
-+++ b/drivers/md/bitmap.c
-@@ -494,7 +494,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap)
- bitmap_super_t *sb;
- unsigned long chunksize, daemon_sleep, write_behind;
-
-- bitmap->storage.sb_page = alloc_page(GFP_KERNEL);
-+ bitmap->storage.sb_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
- if (bitmap->storage.sb_page == NULL)
- return -ENOMEM;
- bitmap->storage.sb_page->index = 0;
-@@ -541,6 +541,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap)
- sb->state = cpu_to_le32(bitmap->flags);
- bitmap->events_cleared = bitmap->mddev->events;
- sb->events_cleared = cpu_to_le64(bitmap->mddev->events);
-+ bitmap->mddev->bitmap_info.nodes = 0;
-
- kunmap_atomic(sb);
-
-@@ -568,7 +569,7 @@ static int bitmap_read_sb(struct bitmap *bitmap)
- goto out_no_sb;
- }
- /* page 0 is the superblock, read it... */
-- sb_page = alloc_page(GFP_KERNEL);
-+ sb_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
- if (!sb_page)
- return -ENOMEM;
- bitmap->storage.sb_page = sb_page;
-@@ -611,8 +612,15 @@ re_read:
- daemon_sleep = le32_to_cpu(sb->daemon_sleep) * HZ;
- write_behind = le32_to_cpu(sb->write_behind);
- sectors_reserved = le32_to_cpu(sb->sectors_reserved);
-- nodes = le32_to_cpu(sb->nodes);
-- strlcpy(bitmap->mddev->bitmap_info.cluster_name, sb->cluster_name, 64);
-+ /* XXX: This is an ugly hack to ensure that we don't use clustering
-+ in case dm-raid is in use and the nodes written in bitmap_sb
-+ is erroneous.
-+ */
-+ if (!bitmap->mddev->sync_super) {
-+ nodes = le32_to_cpu(sb->nodes);
-+ strlcpy(bitmap->mddev->bitmap_info.cluster_name,
-+ sb->cluster_name, 64);
-+ }
-
- /* verify that the bitmap-specific fields are valid */
- if (sb->magic != cpu_to_le32(BITMAP_MAGIC))
-@@ -649,7 +657,7 @@ re_read:
- goto out;
- }
- events = le64_to_cpu(sb->events);
-- if (!nodes && (events < bitmap->mddev->events)) {
-+ if (err == 0 && !nodes && (events < bitmap->mddev->events)) {
- printk(KERN_INFO
- "%s: bitmap file is out of date (%llu < %llu) "
- "-- forcing full recovery\n",
-diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 4dbed4a..6bd8bc3 100644
---- a/drivers/md/md.c
-+++ b/drivers/md/md.c
-@@ -7415,7 +7415,7 @@ int md_setup_cluster(struct mddev *mddev, int nodes)
- err = request_module("md-cluster");
- if (err) {
- pr_err("md-cluster module not found.\n");
-- return err;
-+ return -ENOENT;
- }
-
- spin_lock(&pers_lock);