Linux 3.4.4

This commit is contained in:
Justin M. Forbes 2012-06-22 16:53:07 -05:00
parent 2da3bb764c
commit 1b3fae83d0
3 changed files with 6 additions and 37 deletions

View File

@ -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 4
%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 3
%define stable_update 4
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@ -775,9 +775,6 @@ Patch22031: SUNRPC-move-per-net-operations-from-svc_destroy.patch
#rhbz 832741
Patch22032: cifs-fix-parsing-of-password-mount-option.patch
#rhbz 832188
Patch22033: udl-bind-fix.patch
#rhbz 831807
Patch22034: usb-storage-try-read_capacity-10-first.patch
@ -1442,9 +1439,6 @@ ApplyPatch SUNRPC-move-per-net-operations-from-svc_destroy.patch
#rhbz 832741
ApplyPatch cifs-fix-parsing-of-password-mount-option.patch
#rhbz 832188
ApplyPatch udl-bind-fix.patch
#rhbz 831807
ApplyPatch usb-storage-try-read_capacity-10-first.patch
@ -2186,6 +2180,9 @@ fi
# and build.
%changelog
* Fri Jun 22 2012 Justin M. Forbes <jforbes@redhat.com> 3.4.4-1
- Linux 3.4.4
* Fri Jun 22 2012 Josh Boyer <jwboyer@redhat.com>
- Add uprobe backports from Anton Arapov (rhbz 832083)
- Disable UDL DRM driver per Dave Airlie

View File

@ -1,2 +1,2 @@
967f72983655e2479f951195953e8480 linux-3.4.tar.xz
3b6cf4f6337346ee78904eb70e2d4e08 patch-3.4.3.xz
58e6672d932d74d5e2b6811b9d37d67c patch-3.4.4.xz

View File

@ -1,28 +0,0 @@
@@ -, +, @@
drivers/gpu/drm/udl/udl_drv.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ a/drivers/gpu/drm/udl/udl_drv.c
@@ -13,8 +13,21 @@
static struct drm_driver driver;
+/*
+ * There are many DisplayLink-based graphics products, all with unique PIDs.
+ * So we match on DisplayLink's VID + Vendor-Defined Interface Class (0xff)
+ * We also require a match on SubClass (0x00) and Protocol (0x00),
+ * which is compatible with all known USB 2.0 era graphics chips and firmware,
+ * but allows DisplayLink to increment those for any future incompatible chips
+ */
static struct usb_device_id id_table[] = {
- {.idVendor = 0x17e9, .match_flags = USB_DEVICE_ID_MATCH_VENDOR,},
+ {.idVendor = 0x17e9, .bInterfaceClass = 0xff,
+ .bInterfaceSubClass = 0x00,
+ .bInterfaceProtocol = 0x00,
+ .match_flags = USB_DEVICE_ID_MATCH_VENDOR |
+ USB_DEVICE_ID_MATCH_INT_CLASS |
+ USB_DEVICE_ID_MATCH_INT_SUBCLASS |
+ USB_DEVICE_ID_MATCH_INT_PROTOCOL,},
{},
};
MODULE_DEVICE_TABLE(usb, id_table);