Conflicts with Marc-André's "[PATCH v7 00/10] qapi: untie 'if'
conditions from C preprocessor", which I queued for 6.2.  The conflicts
look harmless to me.


Reply via email to