All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jkosina@suse.cz>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Subject: Re: linux-next: manual merge of the tty tree with the trivial tree
Date: Wed, 9 Dec 2009 12:28:54 -0800	[thread overview]
Message-ID: <20091209202854.GA8222@kroah.com> (raw)
In-Reply-To: <20091210021100.b606b224.sfr@canb.auug.org.au>

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

  reply	other threads:[~2009-12-09 20:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-09  5:28 linux-next: manual merge of the tty tree with the trivial tree Stephen Rothwell
2009-12-09 14:38 ` Jiri Kosina
2009-12-09 15:11   ` Stephen Rothwell
2009-12-09 20:28     ` Greg KH [this message]
2009-12-10 11:21       ` Jiri Kosina
2009-12-10 14:39         ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091209202854.GA8222@kroah.com \
    --to=greg@kroah.com \
    --cc=cascardo@holoscopio.com \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.