On Thu, Dec 05, 2024, Borislav Petkov wrote: > On Tue, Dec 03, 2024 at 11:47:33AM -0800, Sean Christopherson wrote: > > It applies cleanly on my tree (github.com/kvm-x86/linux.git next) > > Could it be that you changed things in the meantime? Nope, I double checked that I'm using the same base. > (Very similar result on Paolo's next branch.) > > $ git log -1 > commit c55f6b8a2441b20ef12e4b35d4888a22299ddc90 (HEAD -> refs/heads/kvm-next, tag: refs/tags/kvm-x86-next-2024.11.04, refs/remotes/kvm-x86/next) > Merge: f29af315c943 bc17fccb37c8 > Author: Sean Christopherson <seanjc@xxxxxxxxxx> > Date: Tue Nov 5 05:13:01 2024 +0000 > > Merge branch 'vmx' > > * vmx: > KVM: VMX: Remove the unused variable "gpa" in __invept() > > > $ patch -p1 --dry-run -i /tmp/0001-tmp.patch > checking file arch/x86/include/asm/kvm-x86-ops.h > checking file arch/x86/include/asm/kvm_host.h Are you trying to apply this patch directly on kvm/next | kvm-x86/next? This is patch 12 of 15. > Hunk #1 succeeded at 1817 (offset -2 lines). > checking file arch/x86/kvm/lapic.h > checking file arch/x86/kvm/svm/svm.c > Reversed (or previously applied) patch detected! Assume -R? [n] n > Apply anyway? [n] y > Hunk #1 FAILED at 79. > Hunk #2 FAILED at 756. > Hunk #3 FAILED at 831. > Hunk #4 FAILED at 870. > Hunk #5 FAILED at 907. > Hunk #6 succeeded at 894 with fuzz 1 (offset -30 lines). > Hunk #7 FAILED at 1002. > Hunk #8 FAILED at 1020. > Hunk #9 FAILED at 1103. > Hunk #10 FAILED at 1121. > Hunk #11 FAILED at 1309. > Hunk #12 FAILED at 1330. > Hunk #13 FAILED at 1456. > Hunk #14 succeeded at 1455 (offset -35 lines). > Hunk #15 succeeded at 1479 (offset -35 lines). > Hunk #16 FAILED at 1555. > Hunk #17 succeeded at 3220 (offset -40 lines). > Hunk #18 FAILED at 4531. > Hunk #19 succeeded at 5194 (offset -38 lines). > Hunk #20 succeeded at 5352 (offset -38 lines). > 14 out of 20 hunks FAILED > checking file arch/x86/kvm/svm/svm.h > checking file arch/x86/kvm/vmx/main.c > checking file arch/x86/kvm/vmx/vmx.c > Hunk #2 succeeded at 642 (offset -2 lines). > Hunk #3 FAILED at 3943. > Hunk #4 FAILED at 3985. > Hunk #5 succeeded at 4086 (offset -1 lines). > Hunk #6 succeeded at 7532 (offset 6 lines). > Hunk #7 succeeded at 7812 (offset 6 lines). > Hunk #8 succeeded at 7827 (offset 6 lines). > 2 out of 8 hunks FAILED > checking file arch/x86/kvm/vmx/vmx.h > checking file arch/x86/kvm/vmx/x86_ops.h > checking file arch/x86/kvm/x86.c > Hunk #1 succeeded at 10837 (offset -3 lines). > > -- > Regards/Gruss, > Boris. > > https://people.kernel.org/tglx/notes-about-netiquette
