Merge commit 'origin/master' into next
Benjamin Herrenschmidt [Wed, 9 Dec 2009 06:14:38 +0000 (17:14 +1100)]
Conflicts:
include/linux/kvm.h

14 files changed:
1  2 
Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
MAINTAINERS
arch/powerpc/include/asm/hvcall.h
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/time.c
arch/powerpc/kernel/traps.c
arch/powerpc/kvm/powerpc.c
drivers/ata/Kconfig
drivers/ata/Makefile
include/linux/kvm.h
include/linux/pci_ids.h
virt/kvm/kvm_main.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -190,16 -185,16 +190,19 @@@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE
         * prolog code of the PerformanceMonitor one. A little
         * trickery is thus necessary
         */
+ performance_monitor_pSeries_1:
        . = 0xf00
 +      DO_KVM  0xf00
        b       performance_monitor_pSeries
  
+ altivec_unavailable_pSeries_1:
        . = 0xf20
 +      DO_KVM  0xf20
        b       altivec_unavailable_pSeries
  
+ vsx_unavailable_pSeries_1:
        . = 0xf40
 +      DO_KVM  0xf40
        b       vsx_unavailable_pSeries
  
  #ifdef CONFIG_CBE_RAS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -436,9 -487,15 +487,16 @@@ struct kvm_ioeventfd 
  #endif
  #define KVM_CAP_IOEVENTFD 36
  #define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
- /* KVM upstream has more features, but we synched this number.
-    Linux, please remove this comment on rebase. */
+ #ifdef __KVM_HAVE_XEN_HVM
+ #define KVM_CAP_XEN_HVM 38
+ #endif
+ #define KVM_CAP_ADJUST_CLOCK 39
+ #define KVM_CAP_INTERNAL_ERROR_DATA 40
+ #ifdef __KVM_HAVE_VCPU_EVENTS
+ #define KVM_CAP_VCPU_EVENTS 41
+ #endif
+ #define KVM_CAP_S390_PSW 42
 +#define KVM_CAP_PPC_SEGSTATE 43
  
  #ifdef KVM_CAP_IRQ_ROUTING
  
Simple merge
Simple merge