netdev-vport: Merge in netdev-patch and netdev-tunnel.