As mentioned in the cover letter, the tools/testing/selftests/kvm/.gitignore change will conflict with the s390 pull request. Easiest solution should be to just take my changes (they're a strict superset). The other notable selftests related change isn't part of this pull request. I posted a mini-series to use the canonical $(ARCH) paths for KVM selftests directories[*], e.g. arm64 instead of aarch64. My plan is to send a v2 after all the arch pull requests are merged and try to squeeze it into the back half of the merge window (I kinda forgot about LPC and KVM Forum, but I'm crossing my fingers here will be minimal conflicts). [*] https://lore.kernel.org/all/20240826190116.145945-1-seanjc@xxxxxxxxxx The following changes since commit 47ac09b91befbb6a235ab620c32af719f8208399: Linux 6.11-rc4 (2024-08-18 13:17:27 -0700) are available in the Git repository at: https://github.com/kvm-x86/linux.git tags/kvm-x86-selftests-6.12 for you to fetch changes up to c32e028057f144f15c06e2f09dfec49b14311910: KVM: selftests: Verify single-stepping a fastpath VM-Exit exits to userspace (2024-09-09 20:12:12 -0700) ---------------------------------------------------------------- KVM selftests changes for 6.12: - Fix a goof that caused some Hyper-V tests to be skipped when run on bare metal, i.e. NOT in a VM. - Add a regression test for KVM's handling of SHUTDOWN for an SEV-ES guest. - Explicitly include one-off assets in .gitignore. Past Sean was completely wrong about not being able to detect missing .gitignore entries. - Verify userspace single-stepping works when KVM happens to handle a VM-Exit in its fastpath. - Misc cleanups ---------------------------------------------------------------- Peter Gonda (1): KVM: selftests: Add SEV-ES shutdown test Sean Christopherson (4): KVM: selftests: Remove unused kvm_memcmp_hva_gva() KVM: selftests: Always unlink memory regions when deleting (VM free) KVM: selftests: Explicitly include committed one-off assets in .gitignore KVM: selftests: Verify single-stepping a fastpath VM-Exit exits to userspace Vitaly Kuznetsov (2): KVM: selftests: Move Hyper-V specific functions out of processor.c KVM: selftests: Re-enable hyperv_evmcs/hyperv_svm_test on bare metal tools/testing/selftests/kvm/.gitignore | 4 + tools/testing/selftests/kvm/include/kvm_util.h | 2 - .../testing/selftests/kvm/include/x86_64/hyperv.h | 18 +++++ .../selftests/kvm/include/x86_64/processor.h | 7 +- tools/testing/selftests/kvm/lib/kvm_util.c | 85 ++-------------------- tools/testing/selftests/kvm/lib/x86_64/hyperv.c | 67 +++++++++++++++++ tools/testing/selftests/kvm/lib/x86_64/processor.c | 61 ---------------- tools/testing/selftests/kvm/x86_64/debug_regs.c | 11 ++- tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c | 2 +- .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 2 +- .../testing/selftests/kvm/x86_64/sev_smoke_test.c | 32 ++++++++ .../testing/selftests/kvm/x86_64/xen_vmcall_test.c | 1 + 12 files changed, 141 insertions(+), 151 deletions(-)