On Thu, Jan 24, 2019 at 03:19:03AM -0500, Bandan Das wrote: > Gerd Hoffmann <kra...@redhat.com> writes: > > > On Tue, Jan 22, 2019 at 07:41:16AM -0500, Bandan Das wrote: > >> > >> qemu_write_full takes care of partial blocking writes, > >> as in cases of larger file sizes > >> > >> Suggested-by: Peter Maydell <peter.mayd...@linaro.org> > >> Signed-off-by: Bandan <b...@redhat.com> > > > > Hmm, doesn't apply, and git fails to do a 3way merge too due to unknown > > sha1. > > Oops, sorry, I realize now this is on top of the write buffer breakup patches.
Hmm, they are queued up already, so that should have worked. > Should I resend a v2 on top of master and send a v3 for the write buffer > breakup > patches ? Can you just send a single series with both this fix and the breakup patches, against latest master? thanks, Gerd