On 27 January 2017 at 13:45, Paolo Bonzini <pbonz...@redhat.com> wrote: > The following changes since commit 3879284d6517dc22529395bdb259f4183b589127: > > Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-23-2' > into staging (2017-01-23 15:59:09 +0000) > > are available in the git repository at: > > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 0a24326232f7c7f8c5ab9080784312d05d496e47: > > memory: don't sign-extend 32-bit writes (2017-01-26 15:29:49 +0100) >
Conflict in target/i386/kvm.c which I didn't quite feel confident of resolving, though I suspect it's mostly trivial. Can you rebase, please? thanks -- PMM
