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

- second part of the ucontrol selftest
- cpumodel sanity check selftest
- gen17 cpumodel changes

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

diff --cc tools/testing/selftests/kvm/Makefile
Simple merge