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

* Fix S390_USER_OPEREXEC so it can now be enabled regardless of other
  unrelated capabilities

* Fix handling of the _PAGE_UNUSED pte bit that could lead to guest
  memory corruption in some scenarios

* A bunch of misc gmap fixes (locking, behaviour under memory pressure)

* Fix CMMA dirty tracking

diff --cc Documentation/virt/kvm/api.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/kvm/dat.c
Simple merge

diff --cc arch/s390/kvm/gmap.c
Simple merge

diff --cc arch/s390/kvm/gmap.h
index 1c040472f56d7a04ff382fb4d65db0ef5a37925a,4e04fbd07696934c956cc000e4d8ba8498eff826..39938d363ec9bb65993a452221ddb6573116dcfc
--- 1/arch/s390/kvm/gmap.h
--- 2/arch/s390/kvm/gmap.h
+++ b/arch/s390/kvm/gmap.h
@@@ -100,11 -100,10 +100,11 @@@ int gmap_ucas_map(struct gmap *gmap, gf
  void gmap_ucas_unmap(struct gmap *gmap, gfn_t c_gfn, unsigned long count);
  int gmap_enable_skeys(struct gmap *gmap);
  int gmap_pv_destroy_range(struct gmap *gmap, gfn_t start, gfn_t end, bool interruptible);
 -int gmap_insert_rmap(struct gmap *sg, gfn_t p_gfn, gfn_t r_gfn, int level);
 +int gmap_insert_rmap(struct kvm_s390_mmu_cache *mc, struct gmap *sg, gfn_t p_gfn,
 +                   gfn_t r_gfn, int level);
  int gmap_protect_rmap(struct kvm_s390_mmu_cache *mc, struct gmap *sg, gfn_t p_gfn, gfn_t r_gfn,
                      kvm_pfn_t pfn, int level, bool wr);
- void gmap_set_cmma_all_dirty(struct gmap *gmap);
+ void _gmap_set_cmma_all(struct gmap *gmap, bool dirty);
  void _gmap_handle_vsie_unshadow_event(struct gmap *parent, gfn_t gfn);
  struct gmap *gmap_create_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *gmap,
                                union asce asce, int edat_level);

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/s390/mm/gmap_helpers.c
Simple merge