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
Subject: linux-next: manual merge of the kgdb tree with Linus' tree
Date: Fri, 23 Jul 2010 12:26:46 +1000 [thread overview]
Message-ID: <20100723122646.a788fc86.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
Hi Jason,
Today's linux-next merge of the kgdb tree got a conflict in
kernel/debug/kdb/kdb_main.c between commit
edd63cb6b91024332d6983fc51058ac1ef0c081e ("sysrq,kdb: Use __handle_sysrq
() for kdb's sysrq function") from Linus' tree and commit
93c47fada46e034941106fb34b76a00a87108fc5 ("kdb: Restore previous sysrq
state") from the kgdb tree.
These are two fixes for the same problem. I effectively reverted the one
from the kgdb tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-07-23 2:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 2:26 Stephen Rothwell [this message]
2010-07-23 3:38 ` linux-next: manual merge of the kgdb tree with Linus' tree Jason Wessel
2010-07-23 7:08 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-08-07 4:05 Stephen Rothwell
2010-08-07 21:17 ` Paul E. McKenney
2010-08-09 5:13 ` 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=20100723122646.a788fc86.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jason.wessel@windriver$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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