| Message ID | 1256193396-15150-2-git-send-email-bryan.wu@canonical.com |
|---|---|
| State | Rejected |
| Headers | show |
NAK, this should be sent to upstream and to stable, so it can come back through the upstream stable tree. As we need to concentrate more on the Lucid development we need to make this shift in the process. -Stefan Bryan Wu wrote: > BugLink: http://bugs.launchpad.net/bugs/456264 > > Add ID for Tlaytech TUE800 CDMA modem to the option driver. > > Signed-off-by: Bryan Wu <bryan.wu@canonical.com> > --- > drivers/usb/serial/option.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c > index 6d46d3f..dfd8409 100644 > --- a/drivers/usb/serial/option.c > +++ b/drivers/usb/serial/option.c > @@ -325,6 +325,9 @@ static int option_resume(struct usb_serial *serial); > #define ALCATEL_VENDOR_ID 0x1bbb > #define ALCATEL_PRODUCT_X060S 0x0000 > > +/* TLAYTECH PRODUCTS */ > +#define TLAYTECH_VENDOR_ID 0x20B9 > +#define TLAYTECH_PRODUCT_TEU800 0x1682 > > static struct usb_device_id option_ids[] = { > { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, > @@ -584,6 +587,7 @@ static struct usb_device_id option_ids[] = { > { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, > { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, > { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) }, > + { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, > { } /* Terminating entry */ > }; > MODULE_DEVICE_TABLE(usb, option_ids);
Stefan Bader wrote: > NAK, this should be sent to upstream and to stable, so it can come back > through the upstream stable tree. I already sent out to upstream maintainer and got an Ack from him. Is that possible for us to merge that? I'm not sure the stable tree will accept this patch, but will try it. > As we need to concentrate more on the Lucid development we need to > make this shift in the process. > Yeah, I understand that Karmic is in SRU now. Thanks, -Bryan > -Stefan > > Bryan Wu wrote: >> BugLink: http://bugs.launchpad.net/bugs/456264 >> >> Add ID for Tlaytech TUE800 CDMA modem to the option driver. >> >> Signed-off-by: Bryan Wu <bryan.wu@canonical.com> >> --- >> drivers/usb/serial/option.c | 4 ++++ >> 1 files changed, 4 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c >> index 6d46d3f..dfd8409 100644 >> --- a/drivers/usb/serial/option.c >> +++ b/drivers/usb/serial/option.c >> @@ -325,6 +325,9 @@ static int option_resume(struct usb_serial *serial); >> #define ALCATEL_VENDOR_ID 0x1bbb >> #define ALCATEL_PRODUCT_X060S 0x0000 >> >> +/* TLAYTECH PRODUCTS */ >> +#define TLAYTECH_VENDOR_ID 0x20B9 >> +#define TLAYTECH_PRODUCT_TEU800 0x1682 >> >> static struct usb_device_id option_ids[] = { >> { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, >> @@ -584,6 +587,7 @@ static struct usb_device_id option_ids[] = { >> { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, >> { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, >> { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) }, >> + { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, >> { } /* Terminating entry */ >> }; >> MODULE_DEVICE_TABLE(usb, option_ids); > >
On Fri, Oct 23, 2009 at 10:48 AM, Bryan Wu <bryan.wu@canonical.com> wrote: > Stefan Bader wrote: >> NAK, this should be sent to upstream and to stable, so it can come back >> through the upstream stable tree. > > I already sent out to upstream maintainer and got an Ack from him. Is that possible for us to merge > that? I'm not sure the stable tree will accept this patch, but will try it. > Bryan, Cc: stable@kernel.org Normally will be accepted quickly. I have several PXA patches merged by stable in last few days. >> As we need to concentrate more on the Lucid development we need to >> make this shift in the process. >> > > Yeah, I understand that Karmic is in SRU now. > > Thanks, > -Bryan > >> -Stefan >> >> Bryan Wu wrote: >>> BugLink: http://bugs.launchpad.net/bugs/456264 >>> >>> Add ID for Tlaytech TUE800 CDMA modem to the option driver. >>> >>> Signed-off-by: Bryan Wu <bryan.wu@canonical.com> >>> --- >>> drivers/usb/serial/option.c | 4 ++++ >>> 1 files changed, 4 insertions(+), 0 deletions(-) >>> >>> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c >>> index 6d46d3f..dfd8409 100644 >>> --- a/drivers/usb/serial/option.c >>> +++ b/drivers/usb/serial/option.c >>> @@ -325,6 +325,9 @@ static int option_resume(struct usb_serial *serial); >>> #define ALCATEL_VENDOR_ID 0x1bbb >>> #define ALCATEL_PRODUCT_X060S 0x0000 >>> >>> +/* TLAYTECH PRODUCTS */ >>> +#define TLAYTECH_VENDOR_ID 0x20B9 >>> +#define TLAYTECH_PRODUCT_TEU800 0x1682 >>> >>> static struct usb_device_id option_ids[] = { >>> { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, >>> @@ -584,6 +587,7 @@ static struct usb_device_id option_ids[] = { >>> { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, >>> { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, >>> { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) }, >>> + { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, >>> { } /* Terminating entry */ >>> }; >>> MODULE_DEVICE_TABLE(usb, option_ids); >> >> > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team >
Eric Miao wrote: > On Fri, Oct 23, 2009 at 10:48 AM, Bryan Wu <bryan.wu@canonical.com> wrote: > >> Stefan Bader wrote: >> >>> NAK, this should be sent to upstream and to stable, so it can come back >>> through the upstream stable tree. >>> >> I already sent out to upstream maintainer and got an Ack from him. Is that possible for us to merge >> that? I'm not sure the stable tree will accept this patch, but will try it. >> >> > > Bryan, > > Cc: stable@kernel.org > > Normally will be accepted quickly. I have several PXA patches > merged by stable in last few days. > > Yeah, Greg said he will add it next week after he back from Japan, heh. -Bryan
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 6d46d3f..dfd8409 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -325,6 +325,9 @@ static int option_resume(struct usb_serial *serial); #define ALCATEL_VENDOR_ID 0x1bbb #define ALCATEL_PRODUCT_X060S 0x0000 +/* TLAYTECH PRODUCTS */ +#define TLAYTECH_VENDOR_ID 0x20B9 +#define TLAYTECH_PRODUCT_TEU800 0x1682 static struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, @@ -584,6 +587,7 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) }, + { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, option_ids);
BugLink: http://bugs.launchpad.net/bugs/456264 Add ID for Tlaytech TUE800 CDMA modem to the option driver. Signed-off-by: Bryan Wu <bryan.wu@canonical.com> --- drivers/usb/serial/option.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)