On 7 Apr 2016, at 22:26, Eric Blake <eblake@...696...> wrote: > 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. Thanks -- Alex Bligh
Attachment:
signature.asc
Description: Message signed with OpenPGP using GPGMail