From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jason Wessel <jason.wessel@windriver•com>
Subject: linux-next: manual merge of the tip tree with the kgdb tree
Date: Mon, 1 Feb 2010 17:29:52 +1100 [thread overview]
Message-ID: <20100201172952.95fe2150.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 965 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/kgdb.c between commit
53a2aa296b5108e9bfdcda7f41221e721d9c7474 ("x86,hw_breakpoint,kgdb: kgdb
to use hw_breakpoint API") from the kgdb tree and commit
cc0967490c1c3824bc5b75718b6ca8a51d9f2617 ("x86, hw_breakpoints, kgdb: Fix
kgdb to use hw_breakpoint API") from the tip tree.
These two commits are similar but sufficiently different to make a mess.
I effectively reverted the kgdb tree version and used the tip tree
version. This also involved reverting the kgdb tree changes to
arch/x86/kernel/hw_breakpoint.c. I hope I got it right (since I had to
reapply a few other kgdb changes by hand) (an x86_64 allmodconfig build
produces no new warnings or errors, so I have some hope).
Someone should give me some guidance as to a way forward here, please.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-02-01 6:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-01 6:29 Stephen Rothwell [this message]
2010-02-01 15:46 ` linux-next: manual merge of the tip tree with the kgdb tree Jason Wessel
2010-02-01 23:25 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-05-14 4:14 Stephen Rothwell
2010-05-14 14:00 ` Don Zickus
2010-01-14 5:13 Stephen Rothwell
2010-01-14 9:26 ` Ingo Molnar
2010-01-14 15:01 ` Jason Wessel
2010-01-14 15:20 ` Steven Rostedt
2010-01-14 15:49 ` Jason Wessel
2009-10-28 7:04 Stephen Rothwell
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=20100201172952.95fe2150.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=jason.wessel@windriver$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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