* linux-next: manual merge of the x86 tree with Linus' tree
@ 2009-05-26 0:52 Stephen Rothwell
2009-05-26 0:56 ` H. Peter Anvin
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-05-26 0:52 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the x86 tree with Linus' tree
2009-05-26 0:52 linux-next: manual merge of the x86 tree with Linus' tree Stephen Rothwell
@ 2009-05-26 0:56 ` H. Peter Anvin
0 siblings, 0 replies; 2+ messages in thread
From: H. Peter Anvin @ 2009-05-26 0:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Thomas Gleixner, Ingo Molnar, linux-next, linux-kernel
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-26 0:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-26 0:52 linux-next: manual merge of the x86 tree with Linus' tree Stephen Rothwell
2009-05-26 0:56 ` H. Peter Anvin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox