From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jason Wessel <jason.wessel@windriver•com>,
Jesse Barnes <jbarnes@virtuousgeek•org>,
Andy Shevchenko <ext-andriy.shevchenko@nokia•com>
Subject: Re: linux-next: manual merge of the tty tree with the kgdb tree
Date: Thu, 5 Aug 2010 08:51:26 -0700 [thread overview]
Message-ID: <20100805155126.GB11121@kroah.com> (raw)
In-Reply-To: <20100805131700.5c03444c.sfr@canb.auug.org.au>
On Thu, Aug 05, 2010 at 01:17:00PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/char/vt.c between commit be6f9f80724e1684987c486c33c4eb882ba50680
> ("vt,console,kdb: automatically set kdb LINES variable") from the kgdb
> tree and commit 46ca223803ae544fb5460bc81d961244866fcdc4 ("vt: clean up
> the code - use kernel library") from the tty tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks, that's an easy fixup.
greg k-h
prev parent reply other threads:[~2010-08-05 15:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-05 3:17 linux-next: manual merge of the tty tree with the kgdb tree Stephen Rothwell
2010-08-05 15:51 ` 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=20100805155126.GB11121@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=ext-andriy.shevchenko@nokia$(echo .)com \
--cc=jason.wessel@windriver$(echo .)com \
--cc=jbarnes@virtuousgeek$(echo .)org \
--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