From: Greg Kroah-Hartman Date: Wed, 29 Apr 2009 22:06:44 +0000 (-0700) Subject: fix up some .27 patches, and drop one that shouldn't have been there. X-Git-Tag: v2.6.27.22~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67cf52a9f38e857774e95891bccf67242fddebd0;p=thirdparty%2Fkernel%2Fstable-queue.git fix up some .27 patches, and drop one that shouldn't have been there. --- diff --git a/queue-2.6.27/0012-USB-add-quirk-to-avoid-config-and-interface-strings.patch b/queue-2.6.27/0012-USB-add-quirk-to-avoid-config-and-interface-strings.patch deleted file mode 100644 index c794484ce2d..00000000000 --- a/queue-2.6.27/0012-USB-add-quirk-to-avoid-config-and-interface-strings.patch +++ /dev/null @@ -1,87 +0,0 @@ -From a9620fdcb8dab4d05f5677110c54b74e7ce1d621 Mon Sep 17 00:00:00 2001 -From: Alan Stern -Date: Thu, 26 Mar 2009 18:25:19 +0000 -Subject: USB: add quirk to avoid config and interface strings - -From: Alan Stern - -upstream commit: 1662e3a7f076e51e3073faf9ce77157b529c475b - -Apparently the Configuration and Interface strings aren't used as -often as the Vendor, Product, and Serial strings. In at least one -device (a Saitek Cyborg Gold 3D joystick), attempts to read the -Configuration string cause the device to stop responding to Control -requests. - -This patch (as1226) adds a quirks flag, telling the kernel not to -read a device's Configuration or Interface strings, together with a -new quirk for the offending joystick. - -Reported-by: Melchior FRANZ -Tested-by: Melchior FRANZ -Signed-off-by: Alan Stern -Cc: stable [2.6.28 and 2.6.29, nothing earlier] -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Chris Wright ---- - drivers/usb/core/message.c | 3 ++- - drivers/usb/core/quirks.c | 4 ++++ - drivers/usb/core/sysfs.c | 4 +++- - include/linux/usb/quirks.h | 3 +++ - 4 files changed, 12 insertions(+), 2 deletions(-) - ---- a/drivers/usb/core/message.c -+++ b/drivers/usb/core/message.c -@@ -1623,7 +1623,8 @@ free_interfaces: - } - kfree(new_interfaces); - -- if (cp->string == NULL) -+ if (cp->string == NULL && -+ !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) - cp->string = usb_cache_string(dev, cp->desc.iConfiguration); - - /* Now that all the interfaces are set up, register them ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -54,6 +54,10 @@ static const struct usb_device_id usb_qu - { USB_DEVICE(0x0638, 0x0a13), .driver_info = - USB_QUIRK_STRING_FETCH_255 }, - -+ /* Saitek Cyborg Gold Joystick */ -+ { USB_DEVICE(0x06a3, 0x0006), .driver_info = -+ USB_QUIRK_CONFIG_INTF_STRINGS }, -+ - /* M-Systems Flash Disk Pioneers */ - { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, - ---- a/drivers/usb/core/sysfs.c -+++ b/drivers/usb/core/sysfs.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include "usb.h" - - /* Active configuration fields */ -@@ -823,7 +824,8 @@ int usb_create_sysfs_intf_files(struct u - * and missing in others. Hence its attribute cannot be created - * before the uevent is broadcast. - */ -- if (alt->string == NULL) -+ if (alt->string == NULL && -+ !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) - alt->string = usb_cache_string(udev, alt->desc.iInterface); - if (alt->string) - retval = device_create_file(&intf->dev, &dev_attr_interface); ---- a/include/linux/usb/quirks.h -+++ b/include/linux/usb/quirks.h -@@ -16,4 +16,7 @@ - /* device can't handle Set-Interface requests */ - #define USB_QUIRK_NO_SET_INTF 0x00000004 - -+/* device can't handle its Configuration or Interface strings */ -+#define USB_QUIRK_CONFIG_INTF_STRINGS 0x00000008 -+ - #endif /* __LINUX_USB_QUIRKS_H */ diff --git a/queue-2.6.27/0053-SCSI-libiscsi-fix-iscsi-pool-error-path.patch b/queue-2.6.27/0053-SCSI-libiscsi-fix-iscsi-pool-error-path.patch index 67b0ba2740e..b5f8259a88c 100644 --- a/queue-2.6.27/0053-SCSI-libiscsi-fix-iscsi-pool-error-path.patch +++ b/queue-2.6.27/0053-SCSI-libiscsi-fix-iscsi-pool-error-path.patch @@ -1,7 +1,7 @@ From b76d2b612cd5c0c6fb82340f9ec241ca75b942f9 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 1 Apr 2009 13:11:29 -0500 -Subject: SCSI: libiscsi: fix iscsi pool error path +Subject: SCSI: libiscsi: fix iscsi pool error path again MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit diff --git a/queue-2.6.27/kprobes-fix-locking-imbalance-in-kretprobes.patch b/queue-2.6.27/kprobes-fix-locking-imbalance-in-kretprobes.patch index 3180d2474de..17039d33636 100644 --- a/queue-2.6.27/kprobes-fix-locking-imbalance-in-kretprobes.patch +++ b/queue-2.6.27/kprobes-fix-locking-imbalance-in-kretprobes.patch @@ -62,7 +62,6 @@ Cc: Masami Hiramatsu Cc: Jim Keniston Cc: Linus Torvalds Cc: Andrew Morton -Cc: [2.6.29.x, 2.6.28.x, 2.6.27.x] LKML-Reference: <20090318113621.GB4129@in.ibm.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman diff --git a/queue-2.6.27/series b/queue-2.6.27/series index 07fcde05490..af5a0731abd 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -2,7 +2,6 @@ 0009-USB-fix-USB_STORAGE_CYPRESS_ATACB.patch 0010-USB-usb-storage-increase-max_sectors-for-tape-driv.patch 0011-USB-gadget-fix-rndis-regression.patch -0012-USB-add-quirk-to-avoid-config-and-interface-strings.patch 0016-cifs-fix-buffer-format-byte-on-NT-Rename-hardlink.patch 0019-b43-fix-b43_plcp_get_bitrate_idx_ofdm-return-type.patch 0022-CIFS-Fix-memory-overwrite-when-saving-nativeFileSys.patch