diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-11-22 09:36:34 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-22 09:36:34 -0500 |
| commit | c877f36df2b9ee642eefc0ac5f8adbb40fe68237 (patch) | |
| tree | eeffe82781f7ca6d4c817e2dc9153a23cfb76658 | |
| parent | 467901ae522a98b8a7bad0c0b21a874669886737 (diff) | |
| download | kernel-c877f36df2b9ee642eefc0ac5f8adbb40fe68237.tar.gz kernel-c877f36df2b9ee642eefc0ac5f8adbb40fe68237.tar.xz kernel-c877f36df2b9ee642eefc0ac5f8adbb40fe68237.zip | |
Linux 3.2-rc2-git7 (upstream bbbc4791cd48ac1)
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | usb-add-quirk-for-logitech-webcams.patch | 31 |
4 files changed, 5 insertions, 36 deletions
@@ -4,7 +4,6 @@ * revert-efi-rtclock.patch * block-stray-block-put-after-teardown.patch * efi-dont-map-boot-services-on-32bit.patch -* usb-add-quirk-for-logitech-webcams.patch (reworked, sent upstream) * epoll-limit-paths.patch (in linux-next via -mm tree) **** Other stuff that should go upstream (in decreasing likelyhood) ************************************ diff --git a/kernel.spec b/kernel.spec index d1b7674dc..97e03e5a0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -695,7 +695,6 @@ Patch2901: linux-2.6-v4l-dvb-experimental.patch Patch12016: disable-i8042-check-on-apple-mac.patch Patch12026: block-stray-block-put-after-teardown.patch -Patch12027: usb-add-quirk-for-logitech-webcams.patch Patch12030: epoll-limit-paths.patch Patch12303: dmar-disable-when-ricoh-multifunction.patch @@ -1337,7 +1336,6 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch ApplyPatch epoll-limit-paths.patch ApplyPatch block-stray-block-put-after-teardown.patch -ApplyPatch usb-add-quirk-for-logitech-webcams.patch # rhbz#605888 ApplyPatch dmar-disable-when-ricoh-multifunction.patch @@ -2100,6 +2098,9 @@ fi # ||----w | # || || %changelog +* Tue Nov 22 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc2.git7.1 +- Linux 3.2-rc2-git7 + * Mon Nov 21 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc2.git6.1 - Linux 3.2-rc2-git6 - Update utrace.patch from Oleg Nesterov @@ -1,4 +1,4 @@ 8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2 210b6056f364be58cb95e11a529e158d patch-3.2-rc2.bz2 -07e0f877e663881b7f87b6e95b4da6c7 patch-3.2-rc2-git6.bz2 +ef02726f0a19a29cbcc69771559247c6 patch-3.2-rc2-git7.bz2 77da243ea639c14679d67788b2b72f41 compat-wireless-2011-11-15.tar.bz2 diff --git a/usb-add-quirk-for-logitech-webcams.patch b/usb-add-quirk-for-logitech-webcams.patch deleted file mode 100644 index 383505004..000000000 --- a/usb-add-quirk-for-logitech-webcams.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 47a9e4d129eb621737f2d7147ce1db0da473a98f Mon Sep 17 00:00:00 2001 -From: Josh Boyer <jwboyer@redhat.com> -Date: Wed, 26 Oct 2011 13:47:56 -0400 -Subject: [PATCH] USB: add quirk for Logitech C600 web cam - -We've had another report of the "chipmunk" sound on a Logitech C600 webcam. -This patch resolves the issue. - -Cc: stable <stable@vger.kernel.org> -Signed-off-by: Josh Boyer <jwboyer@redhat.com> ---- - drivers/usb/core/quirks.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index d6a8d82..caa1991 100644 ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = { - /* Logitech Webcam B/C500 */ - { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, - -+ /* Logitech Webcam C600 */ -+ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* Logitech Webcam Pro 9000 */ - { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, - --- -1.7.6.4 - |