Merge branch 'kvm/cortex-a76-erratum-1165522' into aarch64/for-next/core

Pull in KVM workaround for A76 erratum #116522.

Conflicts:
	arch/arm64/include/asm/cpucaps.h

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/cpucaps.h
index b7f0709a21af35dcada2c5414676b797cca340f3,62d8cd15fdf237a44ceb82e62cc2104ad42f5f44..a89f587d4842f0ce3859bf4604b85307ee5ab225
--- 1/arch/arm64/include/asm/cpucaps.h
--- 2/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@@ -54,8 -54,8 +54,9 @@@
  #define ARM64_HAS_CRC32                               33
  #define ARM64_SSBS                            34
  #define ARM64_WORKAROUND_1188873              35
 -#define ARM64_WORKAROUND_1165522              36
 +#define ARM64_HAS_SB                          36
++#define ARM64_WORKAROUND_1165522              37
  
--#define ARM64_NCAPS                           37
++#define ARM64_NCAPS                           38
  
  #endif /* __ASM_CPUCAPS_H */

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

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