Luiz Capitulino <[email protected]> writes: > On Mon, 10 Mar 2014 15:54:50 +0100 > Markus Armbruster <[email protected]> wrote: > >> Screwed up in commit 2fc0043. Currently harmless, because the enum >> values happen to be identical. > > I'm afraid this conflicts with Wenchao's series: > > [PATCH V9 00/10] qapi script: support enum as discriminator and > better enum name > > Which is already merged in my qmp queue: > > git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
Conflicts because it fixes the bug silently. If we want a record of the bug fix, we can either rebase his series on top of mine, or amend one of his commit messages. I'm not sure it's worth the bother, though. I can give it a try if you think it's worthwhile.
