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

diff --cc Documentation/virt/kvm/api.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/include/asm/assembler.h
Simple merge

diff --cc arch/arm64/include/asm/barrier.h
index 065ba482daf063c87fdde854ad26c4eabb24ccda,5a8367a2b8686f8087e6bb817fc79d2ff6a59b12..2175ec0004edb38fbb2de0a8c9e691e3536c7f62
--- 1/arch/arm64/include/asm/barrier.h
--- 2/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
@@@ -23,8 -23,13 +23,9 @@@
  #define dsb(opt)      asm volatile("dsb " #opt : : : "memory")
  
  #define psb_csync()   asm volatile("hint #17" : : : "memory")
+ #define tsb_csync()   asm volatile("hint #18" : : : "memory")
  #define csdb()                asm volatile("hint #20" : : : "memory")
  
 -#define spec_bar()    asm volatile(ALTERNATIVE("dsb nsh\nisb\n",              \
 -                                               SB_BARRIER_INSN"nop\n",        \
 -                                               ARM64_HAS_SB))
 -
  #ifdef CONFIG_ARM64_PSEUDO_NMI
  #define pmr_sync()                                            \
        do {                                                    \

diff --cc arch/arm64/include/asm/el2_setup.h
Simple merge

diff --cc arch/arm64/include/asm/fpsimd.h
Simple merge

diff --cc arch/arm64/include/asm/pgtable-prot.h
Simple merge

diff --cc arch/arm64/include/asm/sysreg.h
Simple merge

diff --cc drivers/clocksource/arm_arch_timer.c
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-its.c
Simple merge

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

diff --cc kernel/time/clocksource.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge

diff --cc tools/testing/selftests/kvm/.gitignore
Simple merge

diff --cc tools/testing/selftests/kvm/Makefile
Simple merge

diff --cc tools/testing/selftests/kvm/include/kvm_util.h
Simple merge

diff --cc tools/testing/selftests/kvm/lib/kvm_util.c
Simple merge