From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jason Wessel <jason.wessel@windriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: linux-next: manual merge of the kgdb tree with the input tree
Date: Tue, 23 Mar 2010 14:09:46 +1100 [thread overview]
Message-ID: <20100323140946.b56c1d8b.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 746 bytes --]
Hi Jason,
Today's linux-next merge of the kgdb tree got a conflict in
drivers/char/keyboard.c between commit
edc6e384f9d96e54a6d03068d3b03fa5b56b6449 ("Input: implement SysRq as a
separate input handler") from the input tree and commit
4e4b600bf7160c11893bc3f4f8da8a70777b23ba ("When issuing an alt-sysrq-KEY
sequence with the keyboard driver in the")
from the kgdb tree.
The latter changes code moved to another file by the former. I don't
know how to fix this up, so I have just effectively reverted the kgdb
commit for now - suggestions welcome.
BTW, the author of that kgdb commit is "Jason Wessel Subject: [PATCH]
<jason.wessel@windriver.com>".
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-03-23 3:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-23 3:09 Stephen Rothwell [this message]
2010-03-23 13:24 ` Jason Wessel
2010-03-23 23:08 ` Stephen Rothwell
2010-10-06 2:04 Stephen Rothwell
2010-10-06 12:17 ` Jason Wessel
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=20100323140946.b56c1d8b.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dmitry.torokhov@gmail.com \
--cc=jason.wessel@windriver.com \
--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®