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

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature