On 10.03.20 10:15, Andrew Jones wrote: > > Andrew Jones (4): > fixup! selftests: KVM: SVM: Add vmcall test > KVM: selftests: Share common API documentation > KVM: selftests: Enable printf format warnings for TEST_ASSERT > KVM: selftests: Use consistent message for test skipping This looks like a nice cleanup but this does not seem to apply cleanly on kvm/master or linus/master. Which tree is this based on? > > tools/testing/selftests/kvm/.gitignore | 5 +- > .../selftests/kvm/demand_paging_test.c | 6 +- > tools/testing/selftests/kvm/dirty_log_test.c | 3 +- > .../testing/selftests/kvm/include/kvm_util.h | 100 ++++++++- > .../testing/selftests/kvm/include/test_util.h | 5 +- > .../selftests/kvm/lib/aarch64/processor.c | 17 -- > tools/testing/selftests/kvm/lib/assert.c | 6 +- > tools/testing/selftests/kvm/lib/kvm_util.c | 10 +- > .../selftests/kvm/lib/kvm_util_internal.h | 48 +++++ > .../selftests/kvm/lib/s390x/processor.c | 74 ------- > tools/testing/selftests/kvm/lib/test_util.c | 12 ++ > .../selftests/kvm/lib/x86_64/processor.c | 196 ++++-------------- > tools/testing/selftests/kvm/lib/x86_64/svm.c | 2 +- > tools/testing/selftests/kvm/lib/x86_64/vmx.c | 2 +- > tools/testing/selftests/kvm/s390x/memop.c | 2 +- > .../selftests/kvm/s390x/sync_regs_test.c | 2 +- > .../kvm/x86_64/cr4_cpuid_sync_test.c | 2 +- > .../testing/selftests/kvm/x86_64/evmcs_test.c | 6 +- > .../selftests/kvm/x86_64/hyperv_cpuid.c | 8 +- > .../selftests/kvm/x86_64/mmio_warning_test.c | 4 +- > .../selftests/kvm/x86_64/platform_info_test.c | 3 +- > .../kvm/x86_64/set_memory_region_test.c | 3 +- > .../testing/selftests/kvm/x86_64/state_test.c | 4 +- > .../selftests/kvm/x86_64/svm_vmcall_test.c | 3 +- > .../selftests/kvm/x86_64/sync_regs_test.c | 4 +- > .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 2 +- > .../kvm/x86_64/vmx_set_nested_state_test.c | 4 +- > .../selftests/kvm/x86_64/xss_msr_test.c | 2 +- > 28 files changed, 243 insertions(+), 292 deletions(-) >