diff options
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | ucvideo-fix-crash-when-linking-entities.patch | 34 |
3 files changed, 6 insertions, 39 deletions
diff --git a/kernel.spec b/kernel.spec index 0982cb087..8e2f35973 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 1 +%global baserelease 0 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -82,7 +82,7 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 8 +%define rcrev 9 # The git snapshot level %define gitrev 0 # Set rpm version accordingly @@ -720,7 +720,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch Patch13002: revert-efi-rtclock.patch Patch13003: efi-dont-map-boot-services-on-32bit.patch -Patch13005: ucvideo-fix-crash-when-linking-entities.patch Patch13007: add-macbookair41-keyboard.patch @@ -1332,7 +1331,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch ApplyPatch revert-efi-rtclock.patch ApplyPatch efi-dont-map-boot-services-on-32bit.patch -ApplyPatch ucvideo-fix-crash-when-linking-entities.patch ApplyPatch add-macbookair41-keyboard.patch @@ -2051,6 +2049,9 @@ fi # ||----w | # || || %changelog +* Wed Oct 05 2011 Josh Boyer <jwboyer@redhat.com> +- Linux 3.1-rc9 + * Thu Sep 29 2011 Josh Boyer <jwboyer@redhat.com> - Update logitech USB quirk patch @@ -1,2 +1,2 @@ 398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -aae4a0422f4be618fcdbf4bf9de67143 patch-3.1-rc8.bz2 +85fd0d4c9701392b6eb9293035726a02 patch-3.1-rc9.bz2 diff --git a/ucvideo-fix-crash-when-linking-entities.patch b/ucvideo-fix-crash-when-linking-entities.patch deleted file mode 100644 index 69f86d64c..000000000 --- a/ucvideo-fix-crash-when-linking-entities.patch +++ /dev/null @@ -1,34 +0,0 @@ -The uvc_mc_register_entity() function wrongfully selects the -media_entity associated with a UVC entity when creating links. This -results in access to uninitialized media_entity structures and can hit a -BUG_ON statement in media_entity_create_link(). Fix it. - -Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> ---- - drivers/media/video/uvc/uvc_entity.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -This patch should fix a v3.0 regression that results in a kernel crash as -reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637740 and -https://bugzilla.redhat.com/show_bug.cgi?id=735437. - -Test results will be welcome. - -diff --git a/drivers/media/video/uvc/uvc_entity.c b/drivers/media/video/uvc/uvc_entity.c -index 48fea37..29e2399 100644 ---- a/drivers/media/video/uvc/uvc_entity.c -+++ b/drivers/media/video/uvc/uvc_entity.c -@@ -49,7 +49,7 @@ static int uvc_mc_register_entity(struct uvc_video_chain *chain, - if (remote == NULL) - return -EINVAL; - -- source = (UVC_ENTITY_TYPE(remote) != UVC_TT_STREAMING) -+ source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING) - ? (remote->vdev ? &remote->vdev->entity : NULL) - : &remote->subdev.entity; - if (source == NULL) --- -Regards, - -Laurent Pinchart - |