Pushed to master. No backports needed. As discussed offline, I’ll wait for Ben to chime in on the other two patches before pushing them.
Jarno On Aug 8, 2014, at 9:09 AM, Jarno Rajahalme <jrajaha...@nicira.com> wrote: > Acked-by: Jarno Rajahalme <jrajaha...@nicira.com> > >> On Aug 7, 2014, at 6:15 PM, Daniele Di Proietto <ddiproie...@vmware.com> >> wrote: >> >> Signed-off-by: Daniele Di Proietto <ddiproie...@vmware.com> >> --- >> lib/flow.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/lib/flow.c b/lib/flow.c >> index 5e04015..2e5ca0a 100644 >> --- a/lib/flow.c >> +++ b/lib/flow.c >> @@ -118,10 +118,10 @@ struct mf_ctx { >> /* miniflow_push_* macros allow filling in a miniflow data values in order. >> * Assertions are needed only when the layout of the struct flow is modified. >> * 'ofs' is a compile-time constant, which allows most of the code be >> optimized >> - * away. Some GCC versions gave warnigns on ALWAYS_INLINE, so these are >> + * away. Some GCC versions gave warnings on ALWAYS_INLINE, so these are >> * defined as macros. */ >> >> -#if (FLOW_WC_SEQ != 26) >> +#if (FLOW_WC_SEQ != 27) >> #define MINIFLOW_ASSERT(X) ovs_assert(X) >> #else >> #define MINIFLOW_ASSERT(X) >> -- >> 2.0.1 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev