Re: linux-next: manual merge of the x86 tree with Linus' tree
From: H. Peter Anvin
Date: Mon May 25 2009 - 20:57:20 EST
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.
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/