lkml.org 
[lkml]   [2009]   [Dec]   [10]   [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 12:21:00PM +0100, Jiri Kosina wrote:
> On Wed, 9 Dec 2009, Greg KH 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.
>
> Linus has merged my tree, so either you or Linus will have to fix the
> conflict.

Thanks, I'll fix it up in my tree.

greg k-h


\
 
 \ /
  Last update: 2009-12-10 15:41    [W:1.115 / U:0.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site