From: Will Deacon <will@kernel.org>
Date: Thu, 17 Oct 2019 20:42:42 +0000 (-0700)
Subject: Merge branch 'errata/tx2-219' into for-next/fixes
X-Git-Tag: v5.4-rc4~20^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=777d062e5bee0e3c0751cdcbce116a76ee2310ec;p=linux-2.6-block.git

Merge branch 'errata/tx2-219' into for-next/fixes

Workaround for Cavium/Marvell ThunderX2 erratum #219.

* errata/tx2-219:
  arm64: Allow CAVIUM_TX2_ERRATUM_219 to be selected
  arm64: Avoid Cavium TX2 erratum 219 when switching TTBR
  arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT
  arm64: KVM: Trap VM ops when ARM64_WORKAROUND_CAVIUM_TX2_219_TVM is set
---

777d062e5bee0e3c0751cdcbce116a76ee2310ec