Subject: linux-next: manual merge of the kvm tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 2 Jan 2009 11:44:12 +1100

Hi Avi,

Today's linux-next merge of the kvm tree got a conflict in
arch/x86/kernel/reboot.c between commit
824877111cd7f2b4fd2fe6947c5c5cbbb3ac5bd8 ("x86, pci: move
arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h") from the x86 tree
and commit 87238e8d2a086678c246825bc1a9dd148bba77cb ("x86: disable VMX on
all CPUs on reboot") from the kvm tree.

Just overlapping additions.  I fixed it up (see below) and can carry it
as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

diff --cc arch/x86/kernel/reboot.c
index 5b1f23b,72e0e4e..0000000
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@@ -12,7 -12,7 +12,8 @@@
  #include <asm/proto.h>
  #include <asm/reboot_fixups.h>
  #include <asm/reboot.h>
 +#include <asm/pci_x86.h>
+ #include <asm/virtext.h>
  
  #ifdef CONFIG_X86_32
  # include <linux/dmi.h>