On 4 September 2014 12:11, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 3 September 2014 12:26, Michael S. Tsirkin <m...@redhat.com> wrote: >> A problem was reported with this one. >> I fixed it up, will send v2 pull. > > I accidentally just merged the v1 by mistake :-( > Sorry about that; I'm going to merge in the v2 (it conflicts > in vhost_net.c but fairly trivially so I'll fix that up) and then > we should get to where we were intending to go. Apologies > for the error.
As discussed on IRC, reverted the incorrect vhost_net commit and then cleanly merged in the v2 pull. Apologies again for this mess. -- PMM
