Merge commit 'origin/citrix'

diff --cc ofproto/netflow.c
Simple merge

diff --cc vswitchd/bridge.c
index ef390f7,f32d2ba..bece252
--- 1/vswitchd/bridge.c
--- 2/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@@ -3067,9 -2980,22 +3067,22 @@@ port_update_bond_compat(struct port *po
          if (slave->up) {
              bond.up = true;
          }
 -        memcpy(slave->mac, iface->mac, ETH_ADDR_LEN);
 +        netdev_get_etheraddr(iface->netdev, slave->mac);
      }
  
+     if (cfg_get_bool(0, "bonding.%s.fake-iface", port->name)) {
+         struct netdev *bond_netdev;
+ 
+         if (!netdev_open(port->name, NETDEV_ETH_TYPE_NONE, &bond_netdev)) {
+             if (bond.up) {
+                 netdev_turn_flags_on(bond_netdev, NETDEV_UP, true);
+             } else {
+                 netdev_turn_flags_off(bond_netdev, NETDEV_UP, true);
+             }
+             netdev_close(bond_netdev);
+         }
+     }
+ 
      proc_net_compat_update_bond(port->name, &bond);
      free(bond.slaves);
  }

diff --cc xenserver/usr_sbin_xen-bugtool
Simple merge