Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux...

author Christian Borntraeger <borntraeger@de.ibm.com>

Mon, 8 Oct 2018 10:14:54 +0000 (12:14 +0200)

committer Christian Borntraeger <borntraeger@de.ibm.com>

Mon, 8 Oct 2018 10:14:54 +0000 (12:14 +0200)
author Christian Borntraeger <borntraeger@de.ibm.com>
Mon, 8 Oct 2018 10:14:54 +0000 (12:14 +0200)
committer Christian Borntraeger <borntraeger@de.ibm.com>
Mon, 8 Oct 2018 10:14:54 +0000 (12:14 +0200)
diff --cc arch/s390/include/asm/kvm_host.h
Simple merge
diff --cc arch/s390/kvm/kvm-s390.c
Simple merge
author	Christian Borntraeger <borntraeger@de.ibm.com>
	Mon, 8 Oct 2018 10:14:54 +0000 (12:14 +0200)
committer	Christian Borntraeger <borntraeger@de.ibm.com>
	Mon, 8 Oct 2018 10:14:54 +0000 (12:14 +0200)
		1	2
arch/s390/include/asm/kvm_host.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.c	patch \|	diff1 \|	diff2 \|	blob \| history