On Tue, Feb 06, 2024, David Woodhouse wrote: > On Tue, 2024-02-06 at 11:19 -0800, Sean Christopherson wrote: > > > > Patch is corrupt. > > > > git am /home/seanjc/patches/v4_20240116_dwmw2_kvm_x86_xen_inject_vcpu_upcall_vector_when_local_apic_is_enabled.mbx > > Applying: KVM: x86/xen: Inject vCPU upcall vector when local APIC is enabled > > error: corrupt patch at line 17 > > > > cat ~/patches/v4_20240116_dwmw2_kvm_x86_xen_inject_vcpu_upcall_vector_when_local_apic_is_enabled.mbx | patch -p 1 --merge > > patching file arch/x86/kvm/lapic.c > > patch: **** malformed patch at line 59: #include "ioapic.h" > > > > Based on what I see in a web view, I suspect something on your end is converting > > whitespace to fancy unicode equivalents. > > > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > > index 3242f3da2457..75bc7d3f0022 100644 > > --- a/arch/x86/kvm/lapic.c > > +++ b/arch/x86/kvm/lapic.c > > @@ -41,6 +41,7 @@ > > =C2=A0#include "ioapic.h" > > =C2=A0#include "trace.h" > > =C2=A0#include "x86.h" > > That isn't Unicode. Well, it *is*, but it's the subset of Unicode which > is also plain old legacy 8-bit ISO8859-1. For some reason, Evolution > has converted those spaces to non-breaking spaces. I have no idea why > it's suddenly started doing that; this is a Long Term Nosupport distro > that $employer forces me to use, and it hasn't even been updated for > over a year. Out of genuine curiosity, why not use `git send-email`? > The patch is in > https://git.infradead.org/?p=users/dwmw2/linux.git;a=shortlog;h=refs/heads/xenfv > where I'd gathered everything that was pending, but if you prefer I'll > also resend it later when I deal with the locking thing we discussed a > few minutes ago. I'd prefer a resend so that I generate a lore link to exactly what I applied. No rush on either patch, I'm going to be mostly offline from now-ish through tomorrow.
