>> Signed-off-by: Samuel Ghinet <sghi...@cloudbasesolutions.com> > > This didn't apply for me: > > Applying: datapath-windows: fix OVS_VPORT_TYPE > error: patch failed: datapath-windows/include/OvsDpInterfaceExt.h:80 > error: datapath-windows/include/OvsDpInterfaceExt.h: patch does not apply > error: patch failed: datapath-windows/ovsext/Vport.h:93 > error: datapath-windows/ovsext/Vport.h: patch does not apply > Patch failed at 0001 datapath-windows: fix OVS_VPORT_TYPE > 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".
Sam, This might be because there's the following code that got committed in OvsDpInterfaceExt.h: 83 typedef struct ovs_dp_stats OVS_DP_STATS; Rebasing your patch should fix the issue. -- Nithin _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
