Hi Mark,

On Tue, 6 Dec 2022 17:59:16 +0000 Mark Brown broonie@kernel.org wrote:

Today's -next fails to build the KVM selftests on at least arm64 due to commit

9fda6753c9dd ("KVM: selftests: Rename perf_test_util.[ch] to memstress.[ch]")

interacting poorly with commit

a93871d0ea9f ("KVM: selftests: Add a userfaultfd library")

which adds a new user of perf_test_util.h. Do the rename in the new user.

Fixes: 9fda6753c9dd ("KVM: selftests: Rename perf_test_util.[ch] to memstress.[ch]") Fixes: a93871d0ea9f ("KVM: selftests: Add a userfaultfd library") Signed-off-by: Mark Brown broonie@kernel.org Cc: Ricardo Koller ricarkol@google.com Cc: Marc Zyngier maz@kernel.org Cc: David Matlack dmatlack@google.com Cc: Sean Christopherson seanjc@google.com Cc: Paolo Bonzini pbonzini@redhat.com Cc: Stephen Rothwell sfr@canb.auug.org.au

---

tools/testing/selftests/kvm/lib/userfaultfd_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kvm/lib/userfaultfd_util.c b/tools/testing/selftests/kvm/lib/userfaultfd_util.c index 3b44846fc277..92cef20902f1 100644 --- a/tools/testing/selftests/kvm/lib/userfaultfd_util.c +++ b/tools/testing/selftests/kvm/lib/userfaultfd_util.c @@ -20,7 +20,7 @@ #include "kvm_util.h" #include "test_util.h" -#include "perf_test_util.h" +#include "memstress.h" #include "userfaultfd_util.h"

#ifdef __NR_userfaultfd

2.30.2

Thanks for that. I have added that as a merge fix patch to the kvm-arm merge. I assume this will be fixed up when that tree is merged into the kvm tree.