aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--p10.patch16
-rw-r--r--p11.patch14
-rw-r--r--usb-serial-option-add-support-for-inovia-sew858-device.patch4
3 files changed, 32 insertions, 2 deletions
diff --git a/p10.patch b/p10.patch
index 9925d665ac1234..1b3c9626aafe60 100644
--- a/p10.patch
+++ b/p10.patch
@@ -1,3 +1,19 @@
+From foo@baz Sun Oct 6 23:40:53 PDT 2013
+Date: Sun, 06 Oct 2013 23:40:53 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: xenbus: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead. This converts the xenbus code to use the
+correct field.
+
+Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Cc: David Vrabel <david.vrabel@citrix.com>
+Cc: <xen-devel@lists.xenproject.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
---
drivers/xen/xenbus/xenbus_probe.c | 24 ++++++++++++++++++------
drivers/xen/xenbus/xenbus_probe.h | 2 +-
diff --git a/p11.patch b/p11.patch
index 3f26572790b47b..5723c2eabd296b 100644
--- a/p11.patch
+++ b/p11.patch
@@ -1,3 +1,17 @@
+From foo@baz Sun Oct 6 23:44:02 PDT 2013
+Date: Sun, 06 Oct 2013 23:44:02 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: hsi: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead. This converts the hsi code to use the
+correct field.
+
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Kees Cook <keescook@chromium.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
---
drivers/hsi/hsi.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/usb-serial-option-add-support-for-inovia-sew858-device.patch b/usb-serial-option-add-support-for-inovia-sew858-device.patch
index ce37f0ad56ee18..a7f684127f87c2 100644
--- a/usb-serial-option-add-support-for-inovia-sew858-device.patch
+++ b/usb-serial-option-add-support-for-inovia-sew858-device.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
-@@ -450,6 +450,10 @@ static void option_instat_callback(struc
+@@ -451,6 +451,10 @@ static void option_instat_callback(struc
#define CHANGHONG_VENDOR_ID 0x2077
#define CHANGHONG_PRODUCT_CH690 0x7001
@@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
/* some devices interfaces need special handling due to a number of reasons */
enum option_blacklist_reason {
OPTION_BLACKLIST_NONE = 0,
-@@ -1342,6 +1346,7 @@ static const struct usb_device_id option
+@@ -1345,6 +1349,7 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */