Merge tag 'kvm-s390-next-5.18-2' of https://git.kernel.org/pub/scm/linux/kernel/git...

author Paolo Bonzini <pbonzini@redhat.com>

Tue, 15 Mar 2022 21:19:02 +0000 (17:19 -0400)

committer Paolo Bonzini <pbonzini@redhat.com>

Tue, 15 Mar 2022 21:19:02 +0000 (17:19 -0400)
author Paolo Bonzini <pbonzini@redhat.com>
Tue, 15 Mar 2022 21:19:02 +0000 (17:19 -0400)
committer Paolo Bonzini <pbonzini@redhat.com>
Tue, 15 Mar 2022 21:19:02 +0000 (17:19 -0400)
diff --cc arch/s390/kvm/kvm-s390.c
Simple merge
diff --cc arch/s390/kvm/kvm-s390.h
Simple merge
author	Paolo Bonzini <pbonzini@redhat.com>
	Tue, 15 Mar 2022 21:19:02 +0000 (17:19 -0400)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Tue, 15 Mar 2022 21:19:02 +0000 (17:19 -0400)
		1	2
arch/s390/kvm/kvm-s390.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.h	patch \|	diff1 \|	diff2 \|	blob \| history