On 04/07/2016 03:43 AM, Alex Bligh wrote: > Eric, Wouter, > > I put together a note for my own memory on where I think the various patches > to doc/proto.md (and related code patch(es)) circulating over the last few > days are. > > I think "[PATCHv5] docs/proto.md: Clarify SHOULD / MUST / MAY etc" > is probably ready to merge now. Wouter's points were all addressed > in v5, and Eric OK'd v5 apart from some issues re NBD_OPT_GO that > weren't actually introduced by the patch. > > Merged > ====== > > EB: [Nbd] [PATCH] doc: Revert swap of NBD_REP_SERVER fields in NBD_OPT_GO > AB: [Nbd] [PATCHv3] Document format of strings in one place, limit to 4096 > bytes > EB: [Nbd] [PATCH] doc: Wording cleanups > EB: [Nbd] [PATCH] Don't error on NBD_FLAG_CMD_FUA on non-writes > AB: [Nbd] [PATCH] doc/proto.md: NBD_OPT_STARTTLS cannot be used twice > AB: [Nbd] [PATCHv5] Improve the documentation of NBD_CMD_FLUSH and > NBD_CMD_FLAG_FUA. > AB: [Nbd] [PATCH] Amend NBD_OPT_SELECT and NBD_OPT_GO documentation > > In discussion > ============= > > AB: [Nbd] [PATCHv5] docs/proto.md: Clarify SHOULD / MUST / MAY etc
Merge conflicts with the recent: [WV]: Fix typos: s/NDB/NBD/g [AB]: Document format of strings in one place, limit to 4096 bytes and you're already basing other patches on top of it. Since I've already got a wording tweak that will also conflict if done in the wrong order, I'll go ahead and post a v6 of your patch along with mine, ready for use on current nbd.git master. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------
_______________________________________________ Nbd-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nbd-general
