From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 15 Feb 2023 17:35:26 +0000 (-0500)
Subject: Merge tag 'kvm-s390-next-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.17~5432^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4922088f8e90ea163281ba8e69b98f34a7a1b83;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'kvm-s390-next-6.3-1' of https://git./linux/kernel/git/kvms390/linux into HEAD

* Two more V!=R patches
* The last part of the cmpxchg patches
* A few fixes
---

e4922088f8e90ea163281ba8e69b98f34a7a1b83
diff --cc arch/s390/kvm/interrupt.c
index 8edb3be,bbb2806..9250fde
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@@ -3415,8 -3412,9 +3416,9 @@@ void kvm_s390_gib_destroy(void
  	gib = NULL;
  }
  
 -int kvm_s390_gib_init(u8 nisc)
 +int __init kvm_s390_gib_init(u8 nisc)
  {
+ 	u32 gib_origin;
  	int rc = 0;
  
  	if (!css_general_characteristics.aiv) {