On 21 December 2017 at 14:27, Michael S. Tsirkin <m...@redhat.com> wrote: > The following changes since commit 2babfe0c9241c239272a03fec785165a50e8288c: > > Update version for v2.11.0-rc4 release (2017-12-05 16:36:46 +0000) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to 664ed92706ff6e66fa278c3163b5387f11d6daca: > > smbus: do not immediately complete commands (2017-12-21 16:24:44 +0200) > > ---------------------------------------------------------------- > pc, pci, virtio: features, fixes, cleanups > > A bunch of fixes, cleanus and new features all over the place. > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> >
Conflicts in hw/block/nvme.c -- can you fix and resend, please? thanks -- PMM