Re: linux-next: manual merge of the ttydev tree with the usb.current tree

From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>,
	Alan Stern <stern@rowland.harvard.edu>,
	linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the ttydev tree with the usb.current tree
Date: Mon, 27 Apr 2009 21:58:28 -0700	[thread overview]
Message-ID: <20090428045828.GB11810@kroah.com> (raw)
In-Reply-To: <20090428144256.f7870238.sfr@canb.auug.org.au>

On Tue, Apr 28, 2009 at 02:42:56PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Wed, 22 Apr 2009 09:38:57 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > On Wed, Apr 22, 2009 at 05:30:09PM +0100, Alan Cox wrote:
> > > > I'll be happy to help, although no doubt Alan Cox is quite capable of 
> > > > resolving the conflicts on his own.
> > > 
> > > Greg - can you send me the diff you applied in the end, then we can move
> > > the patch from the USB tree into the tty tree otherwise its not going to
> > > be possible to keep the two trees based on Linus base otherwise. Better
> > > yet forcefeed it to Linus instead as its quite a icky bug and wants fixing
> > > ASAP IMHO.
> > 
> > Ok, I'll send it to Linus today, and we can handle the merge after that.
> 
> Any ETA?

It's all in Linus's tree, and has been for a few days now.  Are you
still getting merge errors?

thanks,

greg k-h