Failed in applying to current master (
apply log)
Maintainers: Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, John Snow <jsnow@redhat.com>, Lukas Straub <lukasstraub2@web.de>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Jason Wang <jasowang@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>
docs/devel/qapi-code-gen.rst | 9 ++++-----
docs/devel/writing-monitor-commands.rst | 4 ++--
docs/interop/bitmaps.rst | 6 +++---
qapi/block-core.json | 4 ++--
qapi/char.json | 4 ++--
qapi/introspect.json | 2 +-
qapi/machine.json | 24 ++++++++++++------------
qapi/migration.json | 14 +++++++-------
qapi/misc-target.json | 2 +-
qapi/misc.json | 10 +++++-----
qapi/net.json | 15 +++++++++------
qapi/qdev.json | 5 +++--
qapi/qom.json | 10 ++++++----
qapi/yank.json | 4 ++--
include/qapi/visitor.h | 2 +-
include/qemu/yank.h | 2 +-
qapi/qapi-util.c | 2 +-
util/yank.c | 2 +-
scripts/qapi/parser.py | 2 +-
19 files changed, 64 insertions(+), 59 deletions(-)