The following changes since commit 92741fc4b6cbf7a8f6cce45e9a468d5637a4ff6a:
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging (2016-03-31 11:52:44 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 2354bebaa408b97adf008d3e07f439300b0a5c06: net: fix missing include of qapi/error.h in netmap.c (2016-04-05 11:46:52 +0200) ---------------------------------------------------------------- * FreeBSD build fixes (atomics, qapi/error.h) * x86 KVM fixes (SynIC, KVM_GET/SET_MSRS) * Memory API doc fix * checkpatch fix * Chardev and socket fixes * NBD fixes * exec.c SEGV fix ---------------------------------------------------------------- Alex Bennée (2): cpus: don't use atomic_read for vm_clock_warp_start include/qemu/atomic: add compile time asserts Andrey Smetanin (1): target-i386/kvm: Hyper-V VMBus hypercalls blank handlers Cao jin (1): doc/memory: update MMIO section Cédric Le Goater (1): checkpatch: add target_ulong to typelist Daniel P. Berrange (4): util: retry getaddrinfo if getting EAI_BADFLAGS with AI_V4MAPPED char: fix broken EAGAIN retry on OS-X due to errno clobbering char: ensure all clients are in non-blocking mode net: fix missing include of qapi/error.h in netmap.c Eric Blake (2): nbd: don't request FUA on FLUSH nbd: Fix poor debug message Marc-André Lureau (1): memory: fix segv on qemu_ram_free(block=0x0) Paolo Bonzini (3): update Linux headers to 4.6 target-i386: do not pass MSR_TSC_AUX to KVM ioctls if CPUID bit is not set target-i386: assert that KVM_GET/SET_MSRS can set all requested MSRs block/nbd-client.c | 4 -- cpus.c | 10 ++- docs/memory.txt | 4 +- exec.c | 4 ++ include/qemu/atomic.h | 58 +++++++++------- include/standard-headers/asm-x86/hyperv.h | 4 +- include/standard-headers/linux/input.h | 1 + include/standard-headers/linux/types.h | 5 +- include/standard-headers/linux/virtio_balloon.h | 2 +- include/standard-headers/linux/virtio_blk.h | 6 +- linux-headers/asm-arm64/kvm.h | 6 ++ linux-headers/asm-powerpc/epapr_hcalls.h | 4 +- linux-headers/asm-powerpc/kvm.h | 9 +++ linux-headers/asm-x86/unistd_32.h | 2 + linux-headers/asm-x86/unistd_64.h | 2 + linux-headers/linux/kvm.h | 11 +++ linux-headers/linux/userfaultfd.h | 2 +- linux-headers/linux/vfio.h | 92 ++++++++++++++++++++++++- linux-headers/linux/vhost.h | 6 ++ nbd/client.c | 2 +- net/netmap.c | 1 + qemu-char.c | 39 ++++++----- scripts/checkpatch.pl | 1 + target-i386/hyperv.c | 12 ++++ target-i386/kvm.c | 37 ++++++++-- tests/test-io-channel-socket.c | 5 +- util/qemu-sockets.c | 19 ++++- 27 files changed, 276 insertions(+), 72 deletions(-) -- 2.5.5