Merge remote-tracking branch 'kvm-arm/next' into master

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 Oct 2020 01:13:04 +0000 (12:13 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 Oct 2020 01:13:04 +0000 (12:13 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Oct 2020 01:13:04 +0000 (12:13 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Oct 2020 01:13:04 +0000 (12:13 +1100)
diff --cc arch/arm64/kvm/hyp/nvhe/tlb.c
Simple merge
diff --cc arch/arm64/kvm/mmu.c
Simple merge
diff --cc arch/arm64/kvm/sys_regs.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Oct 2020 01:13:04 +0000 (12:13 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Oct 2020 01:13:04 +0000 (12:13 +1100)
		1	2
arch/arm64/kvm/hyp/nvhe/tlb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/sys_regs.c	patch \|	diff1 \|	diff2 \|	blob \| history