[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120402162446.GB10138@kroah.com>
Date: Mon, 2 Apr 2012 09:24:46 -0700
From: Greg KH <gregkh@...uxfoundation.org>
To: Ben Hutchings <ben@...adent.org.uk>
Cc: linux-kernel@...r.kernel.org, stable@...r.kernel.org,
torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
alan@...rguk.ukuu.org.uk, Thomas Tuttle <ttuttle@...omium.org>
Subject: Re: [ 032/149] USB: qcserial: add several new serial devices
On Sun, Apr 01, 2012 at 05:00:15PM +0100, Ben Hutchings wrote:
> On Fri, 2012-03-30 at 12:49 -0700, Greg KH wrote:
> > 3.2-stable review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Thomas Tuttle <ttuttle@...omium.org>
> >
> > commit 2db4d87070e87d198ab630e66a898b45eff316d9 upstream.
> >
> > Signed-off-by: Thomas Tuttle <ttuttle@...omium.org>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
> >
> > ---
> > drivers/usb/serial/qcserial.c | 14 ++++++++++++++
> > 1 file changed, 14 insertions(+)
> >
> > --- a/drivers/usb/serial/qcserial.c
> > +++ b/drivers/usb/serial/qcserial.c
> > @@ -36,6 +36,11 @@ static const struct usb_device_id id_tab
> > {USB_DEVICE(0x413c, 0x8171)}, /* Dell Gobi QDL device */
> > {USB_DEVICE(0x1410, 0xa001)}, /* Novatel Gobi Modem device */
> > {USB_DEVICE(0x1410, 0xa008)}, /* Novatel Gobi QDL device */
> > + {USB_DEVICE(0x1410, 0xa010)}, /* Novatel Gobi QDL device */
> [...]
>
> This one is already claimed by option as:
>
> { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) }
>
> Seems there's some confusion here...
Yes, but that's what is in Linus's tree right now, right?
One of them should be removed, but I don't know which one :(
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists