On Tue, Dec 18, 2012 at 04:35:53PM -0600, Anthony Liguori wrote: > Paolo Bonzini <pbonz...@redhat.com> writes: > > > Ok... I had really merged the wrong branch with mst's. I fixed it up and > > pushed again to the same place; it's now commit 6cdf60e, "make check" > > builds and passes. > > > > Here is the diff, sorry for the mistake. > > No problem. I'm processing other pull requests now but will merged this > one tonight after I push the others. > > Michael, I'll still plan on merging your changes through this request so > I won't be processing your pinged pull request since Paolo's contains yours. > > Regards, > > Anthony Liguori
This is painful - I hoped for fast merge to reduce conflicts :(. I already got some patches submitted on list that don't apply on my tree. > > > > Paolo > > > > > > On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonz...@redhat.com> wrote: > > > >> Il 18/12/2012 21:59, Anthony Liguori ha scritto: > >> > But this series breaks the build of make check. It's not just one test > >> > case but almost every single one. I think you must have eliminated an > >> > implicit include of qemu-common.h which makes PRId64 et al all > >> > undeclared. > >> > > >> > I started fixing this too but it became too much for a merge commit > >> > since it affects almost all tests. > >> > > >> > Can you fixup make check and send this series out? I'll make sure to > >> > check tomorrow and merge your pull request if I see it tomorrow. > >> > Otherwise, let me know when you plan on sending it and I'll make sure to > >> > be available to merge it. > >> > >> Hmm, I must have pushed the wrong branch because I remember this failure. > >> > >> Paolo > >>