From: Greg KH <greg@kroah•com>
To: Jiri Kosina <jkosina@suse•cz>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
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: Thu, 10 Dec 2009 06:39:17 -0800 [thread overview]
Message-ID: <20091210143917.GA27161@kroah.com> (raw)
In-Reply-To: <alpine.LNX.2.00.0912101220310.3755@pobox.suse.cz>
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
prev parent reply other threads:[~2009-12-10 14:39 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
2009-12-10 11:21 ` Jiri Kosina
2009-12-10 14:39 ` Greg KH [this message]
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=20091210143917.GA27161@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=cascardo@holoscopio$(echo .)com \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox