lkml.org 
[lkml]   [2009]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tty tree with the trivial tree
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@suse.cz> 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


\
 
 \ /
  Last update: 2009-12-09 21:43    [W:0.062 / U:0.364 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site