Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
	arch/mips/kernel/genex.S

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/kernel/asm-offsets.c
index 9147008f0d517c93eefa53668760405aea30a763,488eaac56028f59ed08fc4030de25dd7d6a59ccb..61bb5a65eb37e177fdd706fa8785567bf23fd4b3
--- 1/arch/arm/kernel/asm-offsets.c
--- 2/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@@ -206,14 -203,8 +204,12 @@@ int main(void
    DEFINE(VCPU_TIMER_CNTV_CVAL,        offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_cval));
    DEFINE(KVM_TIMER_CNTVOFF,   offsetof(struct kvm, arch.timer.cntvoff));
    DEFINE(KVM_TIMER_ENABLED,   offsetof(struct kvm, arch.timer.enabled));
- #endif
    DEFINE(KVM_VGIC_VCTRL,      offsetof(struct kvm, arch.vgic.vctrl_base));
- #endif
    DEFINE(KVM_VTTBR,           offsetof(struct kvm, arch.vttbr));
 +#endif
 +  BLANK();
 +#ifdef CONFIG_VDSO
 +  DEFINE(VDSO_DATA_SIZE,      sizeof(union vdso_data_store));
  #endif
    return 0; 
  }

diff --cc arch/arm/kvm/mmu.c
Simple merge

diff --cc arch/mips/kernel/traps.c
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge

diff --cc arch/s390/kernel/asm-offsets.c
index 6e94edd903183da63bc58770b2ba3940aa27ee59,8dc4db10d1608e81eafad41e5f87d1c92af7bbf5..f35058da8eafd53b678405b5ac6466ff707a3c2f
--- 1/arch/s390/kernel/asm-offsets.c
--- 2/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@@ -166,8 -166,12 +166,9 @@@ int main(void
        DEFINE(__LC_FPREGS_SAVE_AREA, offsetof(struct _lowcore, floating_pt_save_area));
        DEFINE(__LC_GPREGS_SAVE_AREA, offsetof(struct _lowcore, gpregs_save_area));
        DEFINE(__LC_CREGS_SAVE_AREA, offsetof(struct _lowcore, cregs_save_area));
 -#ifdef CONFIG_32BIT
 -      DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, extended_save_area_addr));
 -#else /* CONFIG_32BIT */
        DEFINE(__LC_DATA_EXC_CODE, offsetof(struct _lowcore, data_exc_code));
        DEFINE(__LC_MCCK_FAIL_STOR_ADDR, offsetof(struct _lowcore, failing_storage_address));
+       DEFINE(__LC_VX_SAVE_AREA_ADDR, offsetof(struct _lowcore, vector_save_area_addr));
        DEFINE(__LC_EXT_PARAMS2, offsetof(struct _lowcore, ext_params2));
        DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, floating_pt_save_area));
        DEFINE(__LC_PASTE, offsetof(struct _lowcore, paste));

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/x86/kvm/ioapic.c
Simple merge

diff --cc arch/x86/kvm/lapic.c
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge