---- Original Message ---- > From: Ben Warren <b...@skyportsystems.com> > > Signed-off-by: Ben Warren <b...@skyportsystems.com> > ---
[snip] .... > diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c > index 33dca9b..f72aeca 100644 > --- a/ovn/controller/lflow.c > +++ b/ovn/controller/lflow.c > @@ -15,7 +15,7 @@ > > #include <config.h> > #include "lflow.h" > -#include "dynamic-string.h" > +#include "openvswitch/dynamic-string.h" > #include "ofctrl.h" > #include "ofp-actions.h" > #include "ofpbuf.h" [snip].... > diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c > index f5769b5..fe12d45 100644 > --- a/ovn/controller/ovn-controller.c > +++ b/ovn/controller/ovn-controller.c > @@ -27,7 +27,7 @@ > #include "compiler.h" > #include "daemon.h" > #include "dirs.h" > -#include "dynamic-string.h" > +#include "openvswitch/dynamic-string.h" > #include "openvswitch/vconn.h" > #include "openvswitch/vlog.h" > #include "ovn/lib/ovn-sb-idl.h" Neither of these parts of the patch set go in cleanly, so they should be rebased... Ryan (regXboi) _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
