On 02/11/15 13:42, Jan Beulich wrote: >>>> On 30.10.15 at 19:13, <julien.gr...@citrix.com> wrote: >> This series is based on the patch sent by Jan Beulich to drop >> get_xen_guest_handle [2]. But I wasn't able to apply it cleanly on >> unstable, so I've provided a branch with this patch and this series: >> >> git://xenbits.xen.org/people/julieng/xen-unstable.git branch guest-handle-v1 > > Odd - the patch still appears to apply fine to current staging.
FWIW: julien@chilopoda:~/works/xen> git am /tmp/\[PATCH\]\ drop\ get_xen_guest_handle\(\).eml Applying: drop get_xen_guest_handle() error: patch failed: xen/arch/x86/sysctl.c:31 error: xen/arch/x86/sysctl.c: patch does not apply error: patch failed: xen/arch/x86/x86_64/cpu_idle.c:21 error: xen/arch/x86/x86_64/cpu_idle.c: patch does not apply error: patch failed: xen/include/public/arch-arm.h:195 error: xen/include/public/arch-arm.h: patch does not apply error: patch failed: xen/include/public/arch-x86/xen.h:54 error: xen/include/public/arch-x86/xen.h: patch does not apply Patch failed at 0001 drop get_xen_guest_handle() The copy of the patch that failed is found in: /home/julien/works/xen/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- Julien Grall _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
