* linux-next: manual merge of the kvm tree with the x86 tree
@ 2009-06-03 1:50 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2009-06-03 1:50 UTC (permalink / raw)
To: Avi Kivity
Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Hidetoshi Seto, Jan Kiszka
[-- Attachment #1: Type: text/plain, Size: 672 bytes --]
Hi Avi,
Today's linux-next merge of the kvm tree got a conflict in
arch/x86/include/asm/mce.h between commits
06b851d98266b812b2fa23d007cdf53f41194bbb ("x86, mce: unify, prepare 64bit
in mce.h") and 01c6680a547a3ee8dd170c269ea8e037b3191b71 ("x86, mce:
Cleanup MCG definitions") from the x86 tree and commit
1a6a35a1c82eb3b95719a375da2e3aac2910a1df ("x86: Make MCE defines
32-bit-safe") from the kvm tree.
I think the latter is subsumed by the former commits. I fixed it up (by
using the version from the x86 tree) and can carry the fix as necessary.
--
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] only message in thread
only message in thread, other threads:[~2009-06-03 1:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-03 1:50 linux-next: manual merge of the kvm tree with the x86 tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).