On 24.03.2022 09:13, Juergen Gross wrote: > Today most hypercall handlers have a return type of long, while the > --- a/xen/arch/x86/x86_64/platform_hypercall.c > +++ b/xen/arch/x86/x86_64/platform_hypercall.c > @@ -4,6 +4,7 @@ > > EMIT_FILE; > > +#include <xen/hypercall.h> > #include <xen/lib.h> > #include <compat/platform.h> > #include <xen/hypercall.h>
So I thought I could apply patches 4 and 5 alongside patch 1, but patch 4 contextually conflicts with the change above. Looking more closely I was not able to understand (anymore) what the hunk above is good for: It adds a redundant #include, just for patch 4 to remove the original instance. In turn patch 5 then also conflicts, no matter what the correct resolution would be in patch 4 when pulled ahead of patch 3. Jan
