From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
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: linux-next: manual merge of the tty tree with the kgdb tree
Date: Thu, 5 Aug 2010 13:17:00 +1000 [thread overview]
Message-ID: <20100805131700.5c03444c.sfr@canb.auug.org.au> (raw)
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/char/vt.c
index 4a9eb30,0ecde1b..0000000
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@@ -104,7 -104,7 +104,8 @@@
#include <linux/io.h>
#include <asm/system.h>
#include <linux/uaccess.h>
+#include <linux/kdb.h>
+ #include <linux/ctype.h>
#define MAX_NR_CON_DRIVER 16
next reply other threads:[~2010-08-05 3:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-05 3:17 Stephen Rothwell [this message]
2010-08-05 15:51 ` 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=20100805131700.5c03444c.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ext-andriy.shevchenko@nokia.com \
--cc=greg@kroah.com \
--cc=jason.wessel@windriver.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®