On 19 July 2016 at 19:47, Stefan Hajnoczi <stefa...@redhat.com> wrote: > The following changes since commit 1df8ffb286b65cd446b77f54418293487a85dc43: > > Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20160719-1' into > staging (2016-07-19 14:07:27 +0100) > > are available in the git repository at: > > git://github.com/stefanha/qemu.git tags/block-pull-request > > for you to fetch changes up to 46ea2b6979570598d5c90e8e2d37b5cb4dfbbb62: > > raw_bsd: Convert to byte-based interface (2016-07-19 17:18:34 +0100) > > ----------------------------------------------------------------
Hi. I'm afraid this has a conflict within block/iscsi.c which I'm not confident about being able to resolve correctly (it looks like in one path a function has been replaced and in another path it has had its arguments changed). Could you rebase or otherwise resolve and resend, please? thanks -- PMM
