On Fri, 11 Oct 2019 at 22:26, John Snow <js...@redhat.com> wrote: > > The following changes since commit 98b2e3c9ab3abfe476a2b02f8f51813edb90e72d: > > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' > into staging (2019-10-08 16:08:35 +0100) > > are available in the Git repository at: > > https://github.com/jnsnow/qemu.git tags/bitmaps-pull-request > > for you to fetch changes up to b97d9a1014b61dd0980e7f4a0c9ca1e3b0aaa761: > > dirty-bitmaps: remove deprecated autoload parameter (2019-10-09 17:02:45 > -0400) > > ---------------------------------------------------------------- > Pull request > > ---------------------------------------------------------------- >
Hi -- this has a conflict in block/backup.c -- could you fix up and resend, please ? thanks -- PMM
