On Sat, Dec 11, 2021, Sachin Sant wrote: > next-20211210 ( commit ea922272cbe547) powerpc build fails due to following error: > > arch/powerpc/kvm/book3s_hv.c: In function 'kvmhv_run_single_vcpu': > arch/powerpc/kvm/book3s_hv.c:4591:27: error: 'struct kvm_vcpu' has no member named 'wait' > prepare_to_rcuwait(&vcpu->wait); > ^~ > arch/powerpc/kvm/book3s_hv.c:4608:23: error: 'struct kvm_vcpu' has no member named 'wait' > finish_rcuwait(&vcpu->wait); > ^~ > > commit 510958e997217: KVM: Force PPC to define its own rcuwait object > introduced the error. This is a silent merge conflict between the above commit in the KVM tree and commit ecb6a7207f92 ("KVM: PPC: Book3S HV P9: Remove most of the vcore logic") in the PPC tree. I'll send a patch for the PPC tree that is resolves the issue and is a standalone cleanup.