Merge branch 'kvm/cortex-a76-erratum-1165522' into aarch64/for-next/core
authorWill Deacon <will.deacon@arm.com>
Mon, 10 Dec 2018 18:53:03 +0000 (18:53 +0000)
committerWill Deacon <will.deacon@arm.com>
Mon, 10 Dec 2018 18:53:52 +0000 (18:53 +0000)
commitbc84a2d106beab6000223b569c3bcb9ebf49d9ec
tree41d5fee0c983a8820478c0c7e812b76be43ed07c
parentf357b3a7e17af7736d67d8267edc1ed3d1dd9391
parenta457b0f7f50d4d189f0d009617885e4341133e8e
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
arch/arm64/Kconfig
arch/arm64/include/asm/cpucaps.h
arch/arm64/include/asm/pgtable-hwdef.h
arch/arm64/kernel/cpu_errata.c