]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8b51741468c4a7ad86fa114bdaa39d38dd55fd7c
tree41d5fee0c983a8820478c0c7e812b76be43ed07c
parent7af61241b74aa875a483f809650b508f33622c52
parent600584d54268034f16100600a0240cb434574dde
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