]> 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)
commita4cdb0e501bcf6fcc6380b873f18c4710e1d679c
tree41d5fee0c983a8820478c0c7e812b76be43ed07c
parent6ba99e04539dbcb5ec28e85022b47fbb5bba5f0b
parent40125fb5558e1d270782b4d1dc9a5dbbf20eb02a
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