Updates

4 files changed, 154 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f61b691d01ac..07e29a7bbe19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-bfq
 	pkgver = 4.1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://algo.ing.unimo.it
 	arch = i686
 	arch = x86_64
@@ -23,6 +23,8 @@ pkgbase = linux-bfq
 	source = config.x86_64
 	source = 0004-block-loop-convert-to-per-device-workqueue.patch
 	source = 0005-block-loop-avoiding-too-many-pending-per-work-I-O.patch
+	source = 0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
+	source = bitmap-enable-booting-for-dm-md-raid1.patch
 	sha512sums = 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 	sha512sums = SKIP
 	sha512sums = b498f7a8113c7e31feed64c53c0c09765f55e759e340ac8c8a364bed5e2b148d9f582762ce9c779b7c3a067596ae2b30dcd7a8637ffdc21f011fa18f58ae22ad
@@ -37,6 +39,8 @@ pkgbase = linux-bfq
 	sha512sums = e7b40538ed5b86cd59209a056cf9c96dd8f23828dc96cdc282b0388e4132907446f24d606d11cace62c9a53c81df1439150ef0c9a960bf85b5495e656aa59f2c
 	sha512sums = c82288451d71fc4d268092702ab547ae513d94cc78a31c0fd3543397a3d3a3304936db6a0f3f0ee09e063c94cb2cffcc1c95cba74beb86f6a3806c9f5fa00282
 	sha512sums = 0870b20411538738879fc24ad2363c8a7bfab98c2e00c231e54e991444a8aeda7a4141704097c82f2576d826a8eef2c318d4b1308e871983af1be337e051d28e
+	sha512sums = 4fb043734a99125407dcb13aafa7fb73b0fad4ef9cb55ddf2e4daaf79368606c697556e8945bf6b2b7c2ff4de976ff38340bd349e56aba50978c958c844e13e0
+	sha512sums = 09f7400ee9d49ecbbb64c622de6039fc91b4800abd3bf46e4ee8d906869ba7b5d62ed06e8b5814a108b35d2a1a2614024682d6d39dd36b6498f11c8481ffd153
 
 pkgname = linux-bfq
 	pkgdesc = Linux Kernel and modules with the BFQ scheduler.
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
new file mode 100644
index 000000000000..1d5871606e61
--- /dev/null
+++ b/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
@@ -0,0 +1,48 @@
+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 0bf424518af9..fb553d7884f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,7 +50,7 @@ pkgname=('linux-bfq' 'linux-bfq-headers' 'linux-bfq-docs')
 _kernelname=-bfq
 _srcname=linux-4.1
 pkgver=4.1.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://algo.ing.unimo.it"
 license=('GPL2')
@@ -73,7 +73,9 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'change-default-console-loglevel.patch'
         'config' 'config.x86_64'
         '0004-block-loop-convert-to-per-device-workqueue.patch'
-        '0005-block-loop-avoiding-too-many-pending-per-work-I-O.patch')
+        '0005-block-loop-avoiding-too-many-pending-per-work-I-O.patch'
+        '0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch'
+        'bitmap-enable-booting-for-dm-md-raid1.patch')
         
 prepare() {
     cd ${_srcname}
@@ -89,6 +91,17 @@ prepare() {
         msg " $p"
         patch -Np1 -i "$p"
         done
+        
+    ### 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
+        msg "Fix bluetooth chip initialization on some macbooks (FS#45554)"
+        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
+        msg "Fix kernel oops when booting with root on RAID1 LVM (FS#45548)"
+        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
@@ -444,7 +457,9 @@ sha512sums=('168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d20
             'f4f57eabc29a8fe93a3afe89a2efdfd480674cf3bd7f09dd9dbbce022bb883862abe17b0eb378b8d16a5b2882c2323147539a06ae1025956b73b2794c894b983'
             'e7b40538ed5b86cd59209a056cf9c96dd8f23828dc96cdc282b0388e4132907446f24d606d11cace62c9a53c81df1439150ef0c9a960bf85b5495e656aa59f2c'
             'c82288451d71fc4d268092702ab547ae513d94cc78a31c0fd3543397a3d3a3304936db6a0f3f0ee09e063c94cb2cffcc1c95cba74beb86f6a3806c9f5fa00282'
-            '0870b20411538738879fc24ad2363c8a7bfab98c2e00c231e54e991444a8aeda7a4141704097c82f2576d826a8eef2c318d4b1308e871983af1be337e051d28e')
+            '0870b20411538738879fc24ad2363c8a7bfab98c2e00c231e54e991444a8aeda7a4141704097c82f2576d826a8eef2c318d4b1308e871983af1be337e051d28e'
+            '4fb043734a99125407dcb13aafa7fb73b0fad4ef9cb55ddf2e4daaf79368606c697556e8945bf6b2b7c2ff4de976ff38340bd349e56aba50978c958c844e13e0'
+            '09f7400ee9d49ecbbb64c622de6039fc91b4800abd3bf46e4ee8d906869ba7b5d62ed06e8b5814a108b35d2a1a2614024682d6d39dd36b6498f11c8481ffd153')
             
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
diff --git a/bitmap-enable-booting-for-dm-md-raid1.patch b/bitmap-enable-booting-for-dm-md-raid1.patch
new file mode 100644
index 000000000000..7b29e82f7304
--- /dev/null
+++ b/bitmap-enable-booting-for-dm-md-raid1.patch
@@ -0,0 +1,83 @@
+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);