Kei Nohguchi <k...@nohguchi.com> wrote on 04/14/2016 01:48:46 AM: > From: Kei Nohguchi <k...@nohguchi.com> > To: Ryan Moats/Omaha/IBM@IBMUS > Cc: dev@openvswitch.org > Date: 04/14/2016 01:49 AM > Subject: Re: [ovs-dev] [PATCH v14 2/6] Change encaps_run to work incrementally > > Hi Ryan, >
[snip] > > +<<<<<<< HEAD > > +======= > > Some conflict? > > > +static void > > +check_and_add_tunnel(const struct sbrec_chassis *chassis_rec, > > + const char *chassis_id) > > +{ > > + if (strcmp(chassis_rec->name, chassis_id)) { > > + /* Create tunnels to the other chassis. */ > > + const struct sbrec_encap *encap = preferred_encap (chassis_rec); > > + if (!encap) { > > + VLOG_INFO("No supported encaps for '%s'", chassis_rec-> name); > > + return; > > + } > > + tunnel_add(chassis_rec, encap); > > + } > > +} > > + > > +>>>>>>> Change encaps_run to work incrementally Well that's ... unfortunate ... I'm not sure how the rebase missed that ... I'm loathe to send a full v15 for what is a three line change, but oh well. Ryan _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev