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

From: Greg KH <[email-masked]>
Date: Tue, 1 Jul 2008 08:25:56 -0700

On Tue, Jul 01, 2008 at 06:59:00AM -0500, Felipe Balbi wrote:
> 
> 
> On Tue, 1 Jul 2008 21:57:13 +1000, Stephen Rothwell <[email-masked]>
> wrote:
> > Hi Alan,
> > 
> > Today's linux-next merge of the ttydev tree got a conflict in
> > drivers/usb/serial/ir-usb.c between commit
> > 3128101cf92692e300fdb8bf66a9e8f286cbaa7f ("usb: irda: cleanup on ir-usb
> > module") from the usb tree and commits
> > ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
> > ad58854921eeeab97a09600260ea03fa097394e4 ("48-tty-tidy-usb-ir-usb") from
> > the ttydev tree.
> > 
> > I didn't even know where to start :-(, so I used the version from the
> > ttydev tree (since the other is just a cleanup).
> 
> Greg, should i refresh the patch and resend ?

No, your patch is fine, the tty tree should be able to handle this.

thanks,

greg k-h