From: Will Deacon <will.deacon@arm.com>
Date: Mon, 10 Dec 2018 18:53:03 +0000 (+0000)
Subject: Merge branch 'kvm/cortex-a76-erratum-1165522' into aarch64/for-next/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bc84a2d106beab6000223b569c3bcb9ebf49d9ec;p=linux.git

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
---

bc84a2d106beab6000223b569c3bcb9ebf49d9ec
diff --cc arch/arm64/include/asm/cpucaps.h
index b7f0709a21af3,62d8cd15fdf23..a89f587d4842f
--- a/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 */