On 25.01.20 10:31, Paolo Bonzini wrote: > On 25/01/20 09:29, Christian Borntraeger wrote: >> >> >> On 24.01.20 09:38, Paolo Bonzini wrote: >>> Linux-next merge reported some bad mistakes on my part, so I'm >>> force-pushing kvm/next. Since it was pushed only yesterday and the code >>> is the same except for two changed lines, it shouldn't be a big deal. >>> >>> Paolo >>> >> current KVM/next has the following compile error (due to Seans rework). >> >> CC [M] arch/s390/kvm/kvm-s390.o >> arch/s390/kvm/kvm-s390.c: In function ‘kvm_arch_vcpu_create’: >> arch/s390/kvm/kvm-s390.c:3026:32: error: ‘id’ undeclared (first use in this function); did you mean ‘fd’? >> 3026 | vcpu->arch.sie_block->icpua = id; >> | ^~ >> | fd >> arch/s390/kvm/kvm-s390.c:3026:32: note: each undeclared identifier is reported only once for each function it appears in >> arch/s390/kvm/kvm-s390.c:3028:39: error: ‘kvm’ undeclared (first use in this function) >> 3028 | vcpu->arch.sie_block->gd = (u32)(u64)kvm->arch.gisa_int.origin; >> | ^~~ >> make[2]: *** [scripts/Makefile.build:266: arch/s390/kvm/kvm-s390.o] Error 1 >> make[1]: *** [scripts/Makefile.build:503: arch/s390/kvm] Error 2 >> make: *** [Makefile:1693: arch/s390] Error 2 >> >> Is this part of the fixup that you will do or another issue? > > Nope, I trusted Conny's review on that. :( > > Is this enough? Any chance to get the branch fixed? linux next does not build on s390 due to that and this is far from ideal during the merge window.
