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

diff --cc Documentation/virtual/kvm/api.txt
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/include/asm/traps.h
Simple merge

diff --cc arch/x86/kernel/kvm.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