[kernel/f16] linux 3.6.7

[Justin M. Forbes]

commit e7887c8a4851ff20480918f2ae43b99a2677fe52
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Sat Nov 17 22:37:21 2012 -0600

    linux 3.6.7

 kernel.spec                                        |   13 +--
 ...-divide-by-zero-in-tcp-algorithm-illinois.patch |  117 --------------------
 sources                                            |    2 +-
 ...-fix-crash-at-re-preparing-the-PCM-stream.patch |    4 +-
 4 files changed, 8 insertions(+), 128 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 9dab9fe..1eb0430 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 3
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -66,7 +66,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -698,9 +698,6 @@ Patch22089: 0010-ext4-fix-ext_remove_space-for-punch_hole-case.patch
 Patch22090: 0011-ext4-fix-ext4_flush_completed_IO-wait-semantics.patch
 Patch22091: 0012-ext4-serialize-fallocate-with-ext4_convert_unwritten.patch
 
-#rhbz 871923 871848 CVE-2012-4565
-Patch22092: net-fix-divide-by-zero-in-tcp-algorithm-illinois.patch
-
 # Debug patches
 Patch30000: weird-root-dentry-name-debug.patch
 Patch30010: debug-808990.patch
@@ -1338,9 +1335,6 @@ ApplyPatch 0010-ext4-fix-ext_remove_space-for-punch_hole-case.patch
 ApplyPatch 0011-ext4-fix-ext4_flush_completed_IO-wait-semantics.patch
 ApplyPatch 0012-ext4-serialize-fallocate-with-ext4_convert_unwritten.patch
 
-#rhbz 871923 871848 CVE-2012-4565
-ApplyPatch net-fix-divide-by-zero-in-tcp-algorithm-illinois.patch
-
 #rhbz 871078
 ApplyPatch usb-audio-fix-crash-at-re-preparing-the-PCM-stream.patch
 ApplyPatch USB-EHCI-urb-hcpriv-should-not-be-NULL.patch
@@ -2055,6 +2049,9 @@ fi
 # and build.
 
 %changelog
+* Sat Nov 17 2012 Justin M. Forbes <jforbes at linuxtx.org> - 3.6.7-1
+- linux 3.6.7
+
 * Fri Nov 16 2012 Josh Boyer <jwboyer at redhat.com>
 - Fix oops causing typo in keyspan driver (rhbz 870562)
 - Don't WARN_ON empty queues in iwlwifi (rhbz 873001)
diff --git a/sources b/sources
index d3c14f4..0d260fa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-11d6d8749d4612a77f43f0531c0f2824  patch-3.6.6.xz
+134936c362d8812b5cafcf3c67afdce0  patch-3.6.7.xz
diff --git a/usb-audio-fix-crash-at-re-preparing-the-PCM-stream.patch b/usb-audio-fix-crash-at-re-preparing-the-PCM-stream.patch
index 6d840ea..9f3e6f9 100644
--- a/usb-audio-fix-crash-at-re-preparing-the-PCM-stream.patch
+++ b/usb-audio-fix-crash-at-re-preparing-the-PCM-stream.patch
@@ -105,8 +105,8 @@ index 37428f7..5c12a3f 100644
 --- a/sound/usb/pcm.c
 +++ b/sound/usb/pcm.c
 @@ -552,6 +552,9 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
-	if (snd_BUG_ON(!subs->data_endpoint))
-		return -EIO;
+		goto unlock;
+	}
  
 +	snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint);
 +	snd_usb_endpoint_sync_pending_stop(subs->data_endpoint);