Merge branch 'mainstream'

diff --combined lib/automake.mk
index b2d6dc2,da390ab..ffaf89a
--- 1/lib/automake.mk
--- 2/lib/automake.mk
+++ b/lib/automake.mk
@@@ -97,8 -97,6 +97,8 @@@ lib_libopenvswitch_a_SOURCES = 
        lib/multipath.c \
        lib/multipath.h \
        lib/netdev-dummy.c \
 +      lib/netdev-tunnel.c \
 +      lib/netdev-pltap.c \
        lib/netdev-provider.h \
        lib/netdev-vport.c \
        lib/netdev-vport.h \
@@@ -201,14 -199,14 +201,16 @@@
        lib/svec.h \
        lib/table.c \
        lib/table.h \
+       lib/tag.c \
+       lib/tag.h \
        lib/timer.c \
        lib/timer.h \
        lib/timeval.c \
        lib/timeval.h \
        lib/token-bucket.c \
        lib/token-bucket.h \
 +      lib/tunalloc.c \
 +      lib/tunalloc.h \
        lib/type-props.h \
        lib/unaligned.h \
        lib/unicode.c \

diff --combined lib/dpif.c
index bb95502,b66e3bc..1681911
--- 1/lib/dpif.c
--- 2/lib/dpif.c
+++ b/lib/dpif.c
@@@ -51,8 -51,6 +51,6 @@@ COVERAGE_DEFINE(dpif_flow_flush)
  COVERAGE_DEFINE(dpif_flow_get);
  COVERAGE_DEFINE(dpif_flow_put);
  COVERAGE_DEFINE(dpif_flow_del);
- COVERAGE_DEFINE(dpif_flow_query_list);
- COVERAGE_DEFINE(dpif_flow_query_list_n);
  COVERAGE_DEFINE(dpif_execute);
  COVERAGE_DEFINE(dpif_purge);
  
@@@ -61,7 -59,6 +59,7 @@@ static const struct dpif_class *base_dp
      &dpif_linux_class,
  #endif
      &dpif_netdev_class,
 +    &dpif_planetlab_class,
  };
  
  struct registered_dpif_class {
@@@ -1352,7 -1349,7 +1350,7 @@@ log_flow_message(const struct dpif *dpi
      if (error) {
          ds_put_format(&ds, "(%s) ", ovs_strerror(error));
      }
-     odp_flow_format(key, key_len, mask, mask_len, &ds, true);
+     odp_flow_format(key, key_len, mask, mask_len, NULL, &ds, true);
      if (stats) {
          ds_put_cstr(&ds, ", ");
          dpif_flow_stats_format(stats, &ds);