linux-kernel - linux-next: manual merge of the tip tree with the kgdb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 1 Feb 2010 17:29:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jason Wessel <jason.wessel@...driver.com>
Subject: linux-next: manual merge of the tip tree with the kgdb tree

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped