The following changes since commit 6f398e533f5e259b4f937f4aa9de970f7201d166:
Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210604' into staging (2021-06-05 11:25:52 +0100) are available in the Git repository at: git://github.com/vivier/qemu.git tags/trivial-branch-for-6.1-pull-request for you to fetch changes up to df77d45a51412ca84abd7f1490b48c1bccf07057: vhost-vdpa: Remove redundant declaration of address_space_memory (2021-06-05 21:33:46 +0200) ---------------------------------------------------------------- Trivial branch pull request 20210607 ---------------------------------------------------------------- Dmitry Voronetskiy (1): i386/kvm: The value passed to strerror should be positive John Snow (1): docs: fix broken reference Pavel Dovgalyuk (1): target/nios2: fix page-fit instruction count Philippe Mathieu-Daudé (6): target/riscv: Do not include 'pmp.h' in user emulation misc: Correct relative include path linux-user/syscall: Constify bitmask_transtbl fcntl/mmap flags_tlb[] target/hppa: Remove unused 'memory.h' header target/mips: Fix 'Uncoditional' typo scripts/oss-fuzz: Fix typo in documentation Thomas Huth (1): hw/display/macfb: Classify the "nubus-macfb" as display device Xie Yongji (1): vhost-vdpa: Remove redundant declaration of address_space_memory hw/display/macfb.c | 1 + hw/gpio/aspeed_gpio.c | 2 +- hw/i386/acpi-common.h | 6 +++--- hw/i386/kvm/apic.c | 2 +- hw/i386/kvm/clock.c | 4 ++-- hw/i386/kvm/i8254.c | 10 +++++----- hw/i386/kvm/i8259.c | 4 ++-- hw/i386/kvm/ioapic.c | 4 ++-- hw/intc/ppc-uic.c | 2 +- hw/virtio/vhost-vdpa.c | 1 + include/exec/memory.h | 2 +- include/hw/virtio/vhost-vdpa.h | 1 - include/monitor/monitor.h | 2 +- linux-user/syscall.c | 4 ++-- scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py | 2 +- target/hppa/cpu.h | 1 - target/mips/tcg/translate.c | 6 +++--- target/nios2/translate.c | 2 +- target/riscv/cpu.h | 2 ++ 19 files changed, 30 insertions(+), 28 deletions(-) -- 2.31.1
