Merge branch 'for-next/errata' into for-next/core
authorWill Deacon <will@kernel.org>
Wed, 22 Jan 2020 11:35:05 +0000 (11:35 +0000)
committerWill Deacon <will@kernel.org>
Wed, 22 Jan 2020 11:35:05 +0000 (11:35 +0000)
commitab3906c53144837f1a192b5c3ba71ec2f938c187
treee18d092c350cd73e4c4947193710baf544da59f6
parentaa246c056c43d41140c26706e519b498f056de8a
parent275fa0ea2cf7a84450f9c0ec0d9e7ec168ed2e2d
Merge branch 'for-next/errata' into for-next/core

* for-next/errata: (3 commits)
  arm64: Workaround for Cortex-A55 erratum 1530923
  ...
arch/arm64/Kconfig
arch/arm64/include/asm/cpucaps.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/kernel/cpu_errata.c
arch/arm64/kvm/hyp/switch.c