On Thu, Sep 05, 2013 at 01:38:23PM -0500, Anthony Liguori wrote: > Stefan Hajnoczi <stefa...@redhat.com> writes: > > > The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07: > > > > Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 > > 12:26:04 -0500) > > > > are available in the git repository at: > > Sorry, I forgot to send you this feedback earlier. > > This conflicts badly with a pull request from Michael Tsirkin that I > merged already. Can you rebase against master and resubmit?
Sure, will do. Stefan