linux-kernel - linux-next: manual merge of the x86 tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20090526105249.986c4f3c.sfr@canb.auug.org.au>
Date:	Tue, 26 May 2009 10:52:49 +1000
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>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the x86 tree with Linus' tree

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/boot/memory.c between commit
bca23dba760d6705c013f89113c46570378fb626 ("x86, setup: revert ACPI 3 E820
extended attributes support") from Linus' tree and commit
df7699c56421c0476704f24a43409ac8c505f3d2 ("x86, setup: "glove box" BIOS
interrupts in the core boot code") from the x86 tree.

The former removed the code that the latter modified, so I used the
former (as is done in -tip).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped