> On May 27, 2015, at 9:30 AM, Ben Pfaff <b...@nicira.com> wrote: > > Hi Sorin, I'd like to apply this but I get a patch failure: > > Applying: datapath-windows: Support for custom VXLAN tunnel port > /home/blp/nicira/ovs/.git/rebase-apply/patch:917: trailing whitespace. > > /home/blp/nicira/ovs/.git/rebase-apply/patch:1957: trailing whitespace. > NTSTATUS OvsRemoveAndDeleteVport(PVOID usrParamsCtx, > /home/blp/nicira/ovs/.git/rebase-apply/patch:2016: trailing whitespace. > * > error: patch failed: datapath-windows/ovsext/Datapath.c:925 > error: datapath-windows/ovsext/Datapath.c: patch does not apply > Patch failed at 0001 datapath-windows: Support for custom VXLAN tunnel port > The copy of the patch that failed is found in: > /home/blp/nicira/ovs/.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".
Sorin, v8 might also have the same issue. There’s an issue with formatting the patch in Datapath.c around the line “return status”. Pls. see one of my previous reviews where I identified this. -- Nithin _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
