Subject: Re: linux-next: manual merge of the ttydev tree

From: David Brownell <[email-masked]>
Date: Tue, 1 Jul 2008 09:18:09 -0700

On Tuesday 01 July 2008, Alan Cox wrote:
> On Tue, 1 Jul 2008 Stephen Rothwell <[email-masked]> wrote:
> 
> > Today's linux-next merge of the ttydev tree got a conflict in
> > drivers/usb/gadget/serial.c between commit
> > d4013f65e6b7be39e93845c280482e3f1d7894f0 ("usb gadget: use new serial
> > core") from the usb tree and commit
> > e806c01e6c8cacf955620105398902698ec3d933 ("79-tty-break-errorhandler")
> > from the ttydev tree.
> > 
> > The former patch removes the code modified by the latter.  I have used
> > the version from the usb tree.
> 
> Patch updated to drop that change from the diff

A quick search doesn't turn up a ttydev tree, or that patch.

Is that the right long-term fix, so I can consider this resolved?

- Dave