Re: linux-next: manual merge of the tty tree with the trivial tree

[Greg KH]

On Thu, Dec 10, 2009 at 02:11:00AM +1100, Stephen Rothwell wrote:
> Hi Jiri,
> 
> On Wed, 9 Dec 2009 15:38:19 +0100 (CET) Jiri Kosina <jkosina@xxxxxxx> wrote:
> >
> > On Wed, 9 Dec 2009, Stephen Rothwell wrote:
> > 
> > > I just used the tty tree version where they clashed.  Jiri, you might
> > > consider sending that patch to Greg for the tty tree.
> > 
> > the trivial tree pull request has already been sent to Linus a day ago. I 
> > am now waiting whether it will be merged or missed.
> > 
> > In the latter case, I will split the tty hunk out and send to Greg. In the 
> > former case the conflict would have to be solved either by Greg or Linus.
> 
> OK, that's fine, thanks.

Sounds good to me as well.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/