Eric Blake <ebl...@redhat.com> writes: > On 01/13/2017 10:44 AM, Markus Armbruster wrote: >> This is Marc-André's "[PATCH v8 00/21] qapi doc generation (whole >> version, squashed)" with a few commit messages tweaked, and "[PATCH v8 >> 14/21] (SQUASHED) move doc to schema" unsquashed into 161 patches. >> >> We did all the respins with in this squashed form to reduce noise. >> However, since the unsquashed form is better suited for review, and >> probably nicer if we have to revisit this part of the work down the >> road, I'm proposing to merge this unsquashed. >> >> If you want me to post the unsquashed patches, I'm happy to redo this >> pull request. >> >> If you'd rather pull the squashed version, likewise. >> >> I'm afraid this is a bit of a doc conflict magnet. The sooner we can >> get it in, the easier for Marc-André and me. > > Indeed - there's already a merge conflict with commit e1ff3c6, which > landed between the time you created the pull request and now. > > Also, in trying to merge your branch locally, I get a rejection message > from my git hooks: > > $ git commit > tests/qapi-schema/comments.out:7: new blank line at EOF. > tests/qapi-schema/event-case.out:8: new blank line at EOF. > tests/qapi-schema/ident-with-escape.out:10: new blank line at EOF. > tests/qapi-schema/include-relpath.out:7: new blank line at EOF. > tests/qapi-schema/include-repetition.out:7: new blank line at EOF. > tests/qapi-schema/include-simple.out:7: new blank line at EOF. > tests/qapi-schema/indented-expr.out:13: new blank line at EOF. > tests/qapi-schema/qapi-schema-test.out:446: new blank line at EOF. > > Worth respinning to fix those issues?
Since I have to respin anyway, why not. >> qmp-commands: move 'query-memdev' doc to schema > > This one is the conflict with current master. Thanks for the heads-up, v2 coming.