On 05/10/2017 10:20 PM, Eric Blake wrote: > - int64_t sector_num, int nb_sectors, int *pnum); > + int64_t offset, int64_t bytes, int64_t *pnum);
Minor context conflict after this that, for whichever reason, git could not resolve on its own for me.
On 05/10/2017 10:20 PM, Eric Blake wrote: > - int64_t sector_num, int nb_sectors, int *pnum); > + int64_t offset, int64_t bytes, int64_t *pnum);
Minor context conflict after this that, for whichever reason, git could not resolve on its own for me.