Add all the patches from 2.6.34.4 that apply cleanly.

- Roll up the 2.6.34.4 patches as git-linus.diff
- Fix up usb-wwan-update and drm-core-next patches.
This commit is contained in:
Chuck Ebbert 2010-08-15 07:54:10 -04:00
parent b0632f00ee
commit e158521737
4 changed files with 1827 additions and 3 deletions

View File

@ -572,8 +572,8 @@ index ab6c973..4ea2721 100644
+ mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,
false);
mode->hdisplay = 1366;
mode->vsync_start = mode->vsync_start - 1;
mode->vsync_end = mode->vsync_end - 1;
mode->hsync_start = mode->hsync_start - 1;
mode->hsync_end = mode->hsync_end - 1;
return mode;
}
- mode = NULL;

File diff suppressed because it is too large Load Diff

View File

@ -2214,6 +2214,11 @@ fi
%changelog
* Sun Aug 15 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.33.8-148
- Add all the patches from 2.6.34.4 that apply cleanly.
- Roll up the 2.6.34.4 patches as git-linus.diff
- Fix up usb-wwan-update and drm-core-next patches.
* Sun Aug 15 2010 Chuck Ebbert <cebbert@redhat.com>
- 2.6.33.8 from http://git.kernel.org/?p=linux/kernel/git/jkacur/jk-2.6.git stable/2.6.33.y
- Unrevert stable patch from .33.7:
ssb-handle-netbook-devices-where-the-sprom-address-is-changed.patch

View File

@ -116,7 +116,7 @@ diff -up linux-2.6.33.noarch/drivers/usb/serial/option.c.orig linux-2.6.33.noarc
struct option_port_private {
/* Input endpoints and buffer for this port */
struct urb *in_urbs[N_IN_URB];
@@ -767,216 +740,28 @@ module_exit(option_exit);
@@ -767,223 +740,35 @@ module_exit(option_exit);
static int option_probe(struct usb_serial *serial,
const struct usb_device_id *id)
{
@ -135,6 +135,13 @@ diff -up linux-2.6.33.noarch/drivers/usb/serial/option.c.orig linux-2.6.33.noarc
serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff)
return -ENODEV;
/* Don't bind network interfaces on Huawei K3765 & K4505 */
if (serial->dev->descriptor.idVendor == HUAWEI_VENDOR_ID &&
(serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 ||
serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505) &&
serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
return -ENODEV;
- data = serial->private = kzalloc(sizeof(struct option_intf_private), GFP_KERNEL);
+ data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);
if (!data)