2013-03-27 03:41:45

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the usb tree

Hi Greg,

After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/usb/serial/usb-serial.c: In function 'usb_serial_probe':
drivers/usb/serial/usb-serial.c:887:3: error: 'struct usb_serial_port' has no member named 'delta_msr_wait'

Caused by commit eba0e3c3a0ba ("USB: serial: fix hang when opening port")
fro the usb.current tree interacting with commit 53ab34dc50ad ("USB:
serial: remove unused MSR-wait queue") from the usb tree.

I have reverted the commit from usb.current on the assumption that the
problem it solves has been, or will be, solved some other way.
--
Cheers,
Stephen Rothwell [email protected]

Attachments:
(No filename) (683.00 B)
 (No filename) (836.00 B)
 Download all attachments

2013-03-27 03:51:44

by Ming Lei

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the usb tree

Hi,

On Wed, Mar 27, 2013 at 11:41 AM, Stephen Rothwell <[email protected]> wrote:
>
>
> I have reverted the commit from usb.current on the assumption that the
> problem it solves has been, or will be, solved some other way.

The commit is needed in 3.9 linus tree and stable tree, but for next
tree or 3.10,
a revert commit is required.

We know it is a problem, sorry, :-(


Thanks,
--
Ming Lei

2013-03-27 04:20:42

by Greg KH

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the usb tree

On Wed, Mar 27, 2013 at 11:51:41AM +0800, Ming Lei wrote:
> Hi,
>
> On Wed, Mar 27, 2013 at 11:41 AM, Stephen Rothwell <[email protected]> wrote:
> >
> >
> > I have reverted the commit from usb.current on the assumption that the
> > problem it solves has been, or will be, solved some other way.
>
> The commit is needed in 3.9 linus tree and stable tree, but for next
> tree or 3.10,
> a revert commit is required.
>
> We know it is a problem, sorry, :-(

Yeah, sorry about that, I'll fix this up tomorrow when I merge the trees
together and resolve the conflict.

greg k-h

2013-03-28 18:05:04

by Greg KH

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the usb tree

On Wed, Mar 27, 2013 at 02:41:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/usb/serial/usb-serial.c: In function 'usb_serial_probe':
> drivers/usb/serial/usb-serial.c:887:3: error: 'struct usb_serial_port' has no member named 'delta_msr_wait'
>
> Caused by commit eba0e3c3a0ba ("USB: serial: fix hang when opening port")
> fro the usb.current tree interacting with commit 53ab34dc50ad ("USB:
> serial: remove unused MSR-wait queue") from the usb tree.
>
> I have reverted the commit from usb.current on the assumption that the
> problem it solves has been, or will be, solved some other way.

I've now fixed this in my tree, so all should be good.

thanks,

greg k-h