On Thu, 4 Jul 2019 at 22:29, Michael S. Tsirkin <m...@redhat.com> wrote: > > On Thu, Jul 04, 2019 at 10:25:48AM +0100, Peter Maydell wrote: > > On Tue, 2 Jul 2019 at 16:06, Michael S. Tsirkin <m...@redhat.com> wrote: > > > > > > The following changes since commit > > > 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > > > > > Merge remote-tracking branch > > > 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 > > > 11:28:28 +0100) > > > > > > 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 a360cd11de5ae59db55e128fd209290c777eb177: > > > > > > docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 > > > 10:39:35 -0400) > > > > > > ---------------------------------------------------------------- > > > virtio, pc, pci: features, fixes, cleanups > > > > > > virtio-pmem support. > > > libvhost user mq support. > > > A bunch of fixes all over the place. > > > > > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > > > > > > > This fails to build on all the non-Linux platforms: > > > > In file included from > > /Users/pm215/src/qemu-for-merges/hw/virtio/virtio-pmem.c:21: > > /Users/pm215/src/qemu-for-merges/include/standard-headers/linux/virtio_pmem.h:13:10: > > fatal error: 'linux/types.h' file not found > > #include <linux/types.h> > > ^~~~~~~~~~~~~~~ > > > > thanks > > -- PMM > > Amended and re-pushed. Pls try again, sorry about that. >
Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1 for any user-visible changes. -- PMM