Linux v4.6-rc2-42-g1e1e5ce

4 files changed, 6 insertions, 85 deletions

diff --git a/gitrev b/gitrev
index 785ce2c91..50ea8a7ff 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-1e1e5ce78ff0fb2b1b9296894883c82de29057d0
+541d8f4d59d79f5d37c8c726f723d42ff307db57
diff --git a/kernel.spec b/kernel.spec
index 8d0f4d0a9..98bf64a36 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -629,8 +629,6 @@ Patch686: input-gtco-fix-crash-on-detecting-device-without-end.patch
 #CVE-2016-3136 rhbz 1317007 1317010
 Patch687: mct_u232-sanity-checking-in-probe.patch
 
-Patch688: sound-usb-fix-NULL-dereference-in-usb_audio_probe.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2156,6 +2154,9 @@ fi
 #
 # 
 %changelog
+* Wed Apr 06 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.6.0-0.rc2.git2.1
+- Linux v4.6-rc2-84-g541d8f4
+
 * Tue Apr 05 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.6.0-0.rc2.git1.1
 - Linux v4.6-rc2-42-g1e1e5ce
 - Reenable debugging options.
diff --git a/sound-usb-fix-NULL-dereference-in-usb_audio_probe.patch b/sound-usb-fix-NULL-dereference-in-usb_audio_probe.patch
deleted file mode 100644
index 3ee63e4d4..000000000
--- a/sound-usb-fix-NULL-dereference-in-usb_audio_probe.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From cef7f62d5881e886cd514436bc386a7202af25f1 Mon Sep 17 00:00:00 2001
-From: Nicolai Stange <nicstange@gmail.com>
-Date: Tue, 15 Mar 2016 13:35:06 +0100
-Subject: [PATCH] sound/usb: fix NULL dereference in usb_audio_probe()
-
-With commit
-
-  aebb2b89bff0 ("[media] sound/usb: Use Media Controller API to share
-                 media resources")
-
-an access to quirk->media_device without checking for quirk != NULL has
-been introduced in usb_audio_probe().
-
-With a Plantronics USB headset (device ID 0x047f:0xc010) attached,
-this results in the following splat at boot time:
-
-  BUG: unable to handle kernel NULL pointer dereference at 0000000000000014
-  IP: [<ffffffffa089aa6c>] usb_audio_probe+0x2cc/0x9a0 [snd_usb_audio]
-  Oops: 0000 [#1] SMP
-  [...]
-  CPU: 2 PID: 696 Comm: systemd-udevd Not tainted 4.5.0-next-20160315 #13
-  Hardware name: Dell Inc. Latitude E6540/0725FP, BIOS A10 06/26/2014
-  task: ffff88021c88d7c0 ti: ffff88003d5b0000 task.ti: ffff88003d5b0000
-  RIP: 0010:[<ffffffffa089aa6c>]  [<ffffffffa089aa6c>]
-                                usb_audio_probe+0x2cc/0x9a0 [snd_usb_audio]
-  [...]
-  Call Trace:
-   [<ffffffff815a8e16>] usb_probe_interface+0x136/0x2d0
-   [<ffffffff81509edc>] driver_probe_device+0x22c/0x440
-   [<ffffffff8150a1c1>] __driver_attach+0xd1/0xf0
-   [<ffffffff8150a0f0>] ? driver_probe_device+0x440/0x440
-   [<ffffffff815077ec>] bus_for_each_dev+0x6c/0xc0
-   [<ffffffff815095ce>] driver_attach+0x1e/0x20
-   [<ffffffff81509013>] bus_add_driver+0x1c3/0x280
-   [<ffffffff8150ab10>] driver_register+0x60/0xe0
-   [<ffffffff815a7711>] usb_register_driver+0x81/0x140
-   [<ffffffffa08c7000>] ? 0xffffffffa08c7000
-   [<ffffffffa08c701e>] usb_audio_driver_init+0x1e/0x1000 [snd_usb_audio]
-   [<ffffffff81002123>] do_one_initcall+0xb3/0x1f0
-   [<ffffffff811fb091>] ? __vunmap+0x81/0xd0
-   [<ffffffff8121b8d2>] ? kmem_cache_alloc_trace+0x182/0x1d0
-   [<ffffffff811b0267>] ? do_init_module+0x27/0x1d8
-   [<ffffffff811b029f>] do_init_module+0x5f/0x1d8
-   [<ffffffff8112ce35>] load_module+0x1fe5/0x27a0
-   [<ffffffff81129870>] ? __symbol_put+0x60/0x60
-   [<ffffffff81241690>] ? vfs_read+0x110/0x130
-   [<ffffffff8112d866>] SYSC_finit_module+0xe6/0x120
-   [<ffffffff8112d8be>] SyS_finit_module+0xe/0x10
-   [<ffffffff81003d94>] do_syscall_64+0x64/0x110
-   [<ffffffff817c0b61>] entry_SYSCALL64_slow_path+0x25/0x25
-
-After encountering this, the system-udevd process seems to be blocked
-until it is killed when hitting its timeout of 3min.
-
-In analogy to the other accesses to members of quirk in usb_audio_probe(),
-check for quirk != NULL before accessing its ->media_device.
-
-Fixes: aebb2b89bff0 ("[media] sound/usb: Use Media Controller API to share
-                      media resources")
-Signed-off-by: Nicolai Stange <nicstange@gmail.com>
----
- sound/usb/card.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sound/usb/card.c b/sound/usb/card.c
-index 63244bbba8c7..479621e775bc 100644
---- a/sound/usb/card.c
-+++ b/sound/usb/card.c
-@@ -612,7 +612,7 @@ static int usb_audio_probe(struct usb_interface *intf,
- 	if (err < 0)
- 		goto __error;
- 
--	if (quirk->media_device) {
-+	if (quirk && quirk->media_device) {
- 		/* don't want to fail when media_snd_device_create() fails */
- 		media_snd_device_create(chip, intf);
- 	}
--- 
-2.5.5
-
diff --git a/sources b/sources
index 50b870223..6aa86beac 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 a60d48eee08ec0536d5efb17ca819aef  linux-4.5.tar.xz
 6f557fe90b800b615c85c2ca04da6154  perf-man-4.5.tar.gz
 e3752dbebf18b474b70d589ddb148706  patch-4.6-rc2.xz
-eaa93bab8d4fa5338b602129bc77045b  patch-4.6-rc2-git1.xz
+e19d2860f07149375f11ab7e46a9f127  patch-4.6-rc2-git2.xz