linux-next: manual merge of the kvm tree with the x86 tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature