Merge tag 'kvm-s390-next-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 15 Feb 2023 17:35:26 +0000 (12:35 -0500)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 15 Feb 2023 17:35:26 +0000 (12:35 -0500)
* Two more V!=R patches
* The last part of the cmpxchg patches
* A few fixes

1  2 
Documentation/virt/kvm/api.rst
arch/s390/kvm/interrupt.c
arch/s390/kvm/kvm-s390.c
include/uapi/linux/kvm.h
tools/testing/selftests/kvm/Makefile

Simple merge
@@@ -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) {
Simple merge
Simple merge
Simple merge