Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm into next

Pull KVM updates from Paolo Bonzini:
 "At over 200 commits, covering almost all supported architectures, this
  was a pretty active cycle for KVM.  Changes include:

   - a lot of s390 changes: optimizations, support for migration, GDB
     support and more

   - ARM changes are pretty small: support for the PSCI 0.2 hypercall
     interface on both the guest and the host (the latter acked by
     Catalin)

   - initial POWER8 and little-endian host support

   - support for running u-boot on embedded POWER targets

   - pretty large changes to MIPS too, completing the userspace
     interface and improving the handling of virtualized timer hardware

   - for x86, a larger set of changes is scheduled for 3.17.  Still, we
     have a few emulator bugfixes and support for running nested
     fully-virtualized Xen guests (para-virtualized Xen guests have
     always worked).  And some optimizations too.

  The only missing architecture here is ia64.  It's not a coincidence
  that support for KVM on ia64 is scheduled for removal in 3.17"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (203 commits)
  KVM: add missing cleanup_srcu_struct
  KVM: PPC: Book3S PR: Rework SLB switching code
  KVM: PPC: Book3S PR: Use SLB entry 0
  KVM: PPC: Book3S HV: Fix machine check delivery to guest
  KVM: PPC: Book3S HV: Work around POWER8 performance monitor bugs
  KVM: PPC: Book3S HV: Make sure we don't miss dirty pages
  KVM: PPC: Book3S HV: Fix dirty map for hugepages
  KVM: PPC: Book3S HV: Put huge-page HPTEs in rmap chain for base address
  KVM: PPC: Book3S HV: Fix check for running inside guest in global_invalidates()
  KVM: PPC: Book3S: Move KVM_REG_PPC_WORT to an unused register number
  KVM: PPC: Book3S: Add ONE_REG register names that were missed
  KVM: PPC: Add CAP to indicate hcall fixes
  KVM: PPC: MPIC: Reset IRQ source private members
  KVM: PPC: Graciously fail broken LE hypercalls
  PPC: ePAPR: Fix hypercall on LE guest
  KVM: PPC: BOOK3S: Remove open coded make_dsisr in alignment handler
  KVM: PPC: BOOK3S: Always use the saved DAR value
  PPC: KVM: Make NX bit available with magic page
  KVM: PPC: Disable NX for old magic page using guests
  KVM: PPC: BOOK3S: HV: Add mixed page-size support for guest
  ...

diff --cc Documentation/virtual/kvm/api.txt
Simple merge

diff --cc arch/mips/mm/cache.c
index 9e67cdea3c7484eb46739f3f2799ef5aae58d27b,5aaa5c79973152ce4195b62e2e33f598ec260f9b..f7b91d3a371dd07e7c69c38290f1f0c77b5b3a0a
--- 1/arch/mips/mm/cache.c
--- 2/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@@ -29,8 -29,8 +29,9 @@@ void (*flush_cache_range)(struct vm_are
  void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
        unsigned long pfn);
  void (*flush_icache_range)(unsigned long start, unsigned long end);
 +EXPORT_SYMBOL_GPL(flush_icache_range);
  void (*local_flush_icache_range)(unsigned long start, unsigned long end);
+ EXPORT_SYMBOL_GPL(local_flush_icache_range);
  
  void (*__flush_cache_vmap)(void);
  void (*__flush_cache_vunmap)(void);

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

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

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

diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge

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

diff --cc arch/s390/include/asm/lowcore.h
Simple merge

diff --cc arch/s390/include/asm/mmu_context.h
Simple merge

diff --cc arch/s390/include/asm/ptrace.h
Simple merge

diff --cc arch/s390/kernel/asm-offsets.c
Simple merge

diff --cc arch/s390/kernel/entry.S
index 18e5af848f9a67b7aa7374fe46da9a62d4f6ad95,e66f046b9c434fdc0b2fe1946fc5f78564c89809..70203265196fa704fcc14723ce1df68f53ead4d6
--- 1/arch/s390/kernel/entry.S
--- 2/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@@ -387,10 -389,10 +387,10 @@@ ENTRY(pgm_check_handler
        l       %r1,__TI_task(%r12)
        tmh     %r8,0x0001              # kernel per event ?
        jz      pgm_kprobe
 -      oi      __TI_flags+3(%r12),_TIF_PER_TRAP
 +      oi      __PT_FLAGS+3(%r11),_PIF_PER_TRAP
        mvc     __THREAD_per_address(4,%r1),__LC_PER_ADDRESS
-       mvc     __THREAD_per_cause(2,%r1),__LC_PER_CAUSE
-       mvc     __THREAD_per_paid(1,%r1),__LC_PER_PAID
+       mvc     __THREAD_per_cause(2,%r1),__LC_PER_CODE
+       mvc     __THREAD_per_paid(1,%r1),__LC_PER_ACCESS_ID
  0:    REENABLE_IRQS
        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
        l       %r1,BASED(.Ljump_table)

diff --cc arch/s390/kernel/entry64.S
index c41f3f9067200647441127790afa81ae070f22d7,3c34753de6ade9ab09d59012b771a849fb89a683..f2e674c702e1f904de800b94c33bedfd5fd30b91
--- 1/arch/s390/kernel/entry64.S
--- 2/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@@ -418,10 -421,10 +418,10 @@@ ENTRY(pgm_check_handler
        jz      0f
        tmhh    %r8,0x0001              # kernel per event ?
        jz      pgm_kprobe
 -      oi      __TI_flags+7(%r12),_TIF_PER_TRAP
 +      oi      __PT_FLAGS+7(%r11),_PIF_PER_TRAP
        mvc     __THREAD_per_address(8,%r14),__LC_PER_ADDRESS
-       mvc     __THREAD_per_cause(2,%r14),__LC_PER_CAUSE
-       mvc     __THREAD_per_paid(1,%r14),__LC_PER_PAID
+       mvc     __THREAD_per_cause(2,%r14),__LC_PER_CODE
+       mvc     __THREAD_per_paid(1,%r14),__LC_PER_ACCESS_ID
  0:    REENABLE_IRQS
        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
        larl    %r1,pgm_check_table

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

diff --cc arch/s390/mm/pgtable.c
Simple merge

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

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

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