On 21 July 2016 at 10:58, Stefan Hajnoczi <stefa...@redhat.com> wrote: > On Wed, Jul 20, 2016 at 10:03:17PM +0100, Peter Maydell wrote: >> On 20 July 2016 at 17:20, Stefan Hajnoczi <stefa...@redhat.com> wrote: >> > The following changes since commit >> > 338404d061144956b76f9893ca3434d057dff2d4: >> > >> > Merge remote-tracking branch >> > 'remotes/pmaydell/tags/pull-target-arm-20160719' into staging (2016-07-20 >> > 12:48:18 +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 decaeed7734bddc95e2c81858fbbec3e923310a1: >> > >> > raw_bsd: Convert to byte-based interface (2016-07-20 14:24:25 +0100)
> This conflict can be resolved by keeping qemu_gluster_co_pdiscard() and > dropping qemu_gluster_co_discard(). Thanks; merged with that conflict resolution and pushed to master. -- PMM
