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

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

Fri, 8 Feb 2019 03:52:21 +0000 (14:52 +1100)

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

Fri, 8 Feb 2019 03:52:21 +0000 (14:52 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 03:52:21 +0000 (14:52 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 03:52:21 +0000 (14:52 +1100)
diff --cc arch/arm/include/asm/arch_gicv3.h
Simple merge
diff --cc arch/arm64/include/asm/kvm_host.h
Simple merge
diff --cc drivers/clocksource/arm_arch_timer.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 8 Feb 2019 03:52:21 +0000 (14:52 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 8 Feb 2019 03:52:21 +0000 (14:52 +1100)
		1	2
arch/arm/include/asm/arch_gicv3.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/kvm_host.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/arm_arch_timer.c	patch \|	diff1 \|	diff2 \|	blob \| history