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

From: Alan Cox <[email-masked]>
Date: Tue, 1 Jul 2008 12:56:31 +0100

On Tue, 1 Jul 2008 21:10:03 +1000
Stephen Rothwell <[email-masked]> wrote:

> Hi Alan,
> 
> 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