linux-kernel - Re: 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Mon, 25 May 2009 17:56:33 -0700
From:	"H. Peter Anvin" <hpa@...or.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the x86 tree with Linus' tree

Stephen Rothwell wrote:
> 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).

tip:x86/setup should contain a proper merge between the two.

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/