Merge branch 'for-next/errata' into for-next/core

* for-next/errata: (3 commits)
  arm64: Workaround for Cortex-A55 erratum 1530923
  ...

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/cpucaps.h
index 33ff25c,3d1aa1b..a61c336
--- 1/arch/arm64/include/asm/cpucaps.h
--- 2/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@@ -55,9 -55,8 +55,9 @@@
  #define ARM64_WORKAROUND_CAVIUM_TX2_219_TVM   45
  #define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM  46
  #define ARM64_WORKAROUND_1542419              47
- #define ARM64_WORKAROUND_1319367              48
+ #define ARM64_WORKAROUND_SPECULATIVE_AT_NVHE  48
 +#define ARM64_HAS_E0PD                                49
  
 -#define ARM64_NCAPS                           49
 +#define ARM64_NCAPS                           50
  
  #endif /* __ASM_CPUCAPS_H */

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

diff --cc arch/arm64/kernel/cpu_errata.c
Simple merge

diff --cc arch/arm64/kvm/hyp/switch.c
Simple merge