09.03.2018 19:41, Eric Blake wrote:
> On 03/08/2018 12:46 PM, Vladimir Sementsov-Ogievskiy wrote:
>> 01 and 02 are splitted and updated "[PATCH] nbd/server: fix space read",
>> others are new.
>>
>> Vladimir Sementsov-Ogievskiy (5):
>> nbd/server: move nbd_co_send_structured_error up
>> nbd/server: fix sparse read
>> nbd/server: fix: check client->closing before reply sending
>> nbd/server: refactor nbd_trip: cmd_read and generic reply
>> nbd/server: refactor nbd_trip: split out nbd_handle_request
>
> I had a tough time applying this one:
>
> Applying: nbd/server: move nbd_co_send_structured_error up
> Applying: nbd/server: fix: check client->closing before reply sending
> Applying: nbd/server: refactor nbd_trip: cmd_read and generic reply
> error: sha1 information is lacking or useless (nbd/server.c).
> error: could not build fake ancestor
> Patch failed at 0004 nbd/server: refactor nbd_trip: cmd_read and
> generic reply
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> I think I've resolved the conflicts correctly, but if I get through
> reviewing this series and posting it to my NBD queue, you may want to
> double-check things.
>
Oh, sorry for this. I should have to rebase it(
--
Best regards,
Vladimir