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 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,

--
Jiri Kosina
SUSE Labs, Novell Inc.


\
 
 \ /
  Last update: 2009-12-10 12:23    [from the cache]
©2003-2011 Jasper Spaans. Advertise on this site