diff --git a/kernel.spec b/kernel.spec index 9796ca3ff..4c482ab63 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 2 +%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 10 +%define stable_update 11 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -703,9 +703,6 @@ Patch22018: atl1c_net_next_update-3.4.patch Patch22055: crypto-testmgr-allow-aesni-intel-and-ghash_clmulni-intel.patch Patch22056: crypto-aesni-intel-fix-wrong-kfree-pointer.patch -#rhbz 836742 -Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch - #rhbz 714271 Patch22060: CPU-hotplug-cpusets-suspend-Dont-modify-cpusets-during.patch @@ -1327,9 +1324,6 @@ ApplyPatch atl1c_net_next_update-3.4.patch ApplyPatch crypto-testmgr-allow-aesni-intel-and-ghash_clmulni-intel.patch ApplyPatch crypto-aesni-intel-fix-wrong-kfree-pointer.patch -#rhbz 836742 -ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch - #rhbz 714271 ApplyPatch CPU-hotplug-cpusets-suspend-Dont-modify-cpusets-during.patch @@ -2041,6 +2035,9 @@ fi # and build. %changelog +* Sun Sep 16 2012 Josh Boyer 3.4.11-1 +- Linux v3.4.11 + * Tue Sep 11 2012 Josh Boyer 3.4.10-2 - Drop old Xen EC2 patch. It is no longer needed per Matt Wilson diff --git a/sources b/sources index b08ce31e1..a4d0de728 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 967f72983655e2479f951195953e8480 linux-3.4.tar.xz -5ac016a4a5b47179a0aee0dbadbb2254 patch-3.4.10.xz +2149df47fc96fec05787bf0197fb7b16 patch-3.4.11.xz diff --git a/uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch b/uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch deleted file mode 100644 index 6606b7d3d..000000000 --- a/uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3771973542a4807b251352253ed22c50e688e573 Mon Sep 17 00:00:00 2001 -From: Jayakrishnan Memana -Date: Sun, 15 Jul 2012 15:54:03 +0200 -Subject: [PATCH] uvcvideo: Reset the bytesused field when recycling an erroneous buffer - -Buffers marked as erroneous are recycled immediately by the driver if -the nodrop module parameter isn't set. The buffer payload size is reset -to 0, but the buffer bytesused field isn't. This results in the buffer -being immediately considered as complete, leading to an infinite loop in -interrupt context. - -Fix the problem by resetting the bytesused field when recycling the -buffer. - -Cc: -Signed-off-by: Jayakrishnan Memana -Signed-off-by: Laurent Pinchart ---- - drivers/media/video/uvc/uvc_queue.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c -index 9288fbd..5577381 100644 ---- a/drivers/media/video/uvc/uvc_queue.c -+++ b/drivers/media/video/uvc/uvc_queue.c -@@ -338,6 +338,7 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, - if ((queue->flags & UVC_QUEUE_DROP_CORRUPTED) && buf->error) { - buf->error = 0; - buf->state = UVC_BUF_STATE_QUEUED; -+ buf->bytesused = 0; - vb2_set_plane_payload(&buf->buf, 0, 0); - return buf; - } --- -1.7.2.5 -