Failed in applying to current master (
apply log)
.mailmap | 9 ++++---
MAINTAINERS | 1 +
block/vmdk.c | 3 ---
docs/amd-memory-encryption.txt | 4 +--
docs/pvrdma.txt | 2 +-
docs/system/build-platforms.rst | 6 ++---
docs/system/target-avr.rst | 47 ++++++++++++++++++++-------------
hw/arm/omap1.c | 1 -
hw/arm/virt-acpi-build.c | 3 +--
hw/block/pflash_cfi01.c | 1 -
hw/core/sysbus.c | 3 ++-
hw/display/cirrus_vga.c | 1 -
hw/display/qxl-logger.c | 2 --
hw/display/vga.c | 1 -
hw/gpio/max7310.c | 3 ---
hw/i386/intel_iommu.c | 1 -
hw/i386/kvm/ioapic.c | 2 +-
hw/ide/ahci.c | 5 ++--
hw/ide/atapi.c | 8 +++---
hw/ide/core.c | 2 +-
hw/ide/pci.c | 2 +-
hw/input/pxa2xx_keypad.c | 10 -------
hw/intc/armv7m_nvic.c | 1 -
hw/intc/exynos4210_combiner.c | 1 -
hw/isa/isa-superio.c | 2 +-
hw/net/can/can_sja1000.c | 2 ++
hw/net/lan9118.c | 2 --
hw/net/virtio-net.c | 1 -
hw/net/xilinx_axienet.c | 23 ----------------
hw/scsi/scsi-disk.c | 44 +++++++++++++++---------------
hw/usb/bus.c | 4 +--
hw/usb/ccid-card-emulated.c | 1 -
hw/vfio/platform.c | 2 +-
hw/virtio/vhost-user.c | 2 +-
include/hw/i2c/i2c.h | 2 +-
include/hw/register.h | 1 +
include/qemu/main-loop.h | 2 +-
linux-user/strace.c | 12 +++++++++
qemu-options.hx | 2 +-
scsi/utils.c | 4 ---
stubs/cmos.c | 2 +-
target/arm/kvm64.c | 1 -
target/arm/translate-a64.c | 7 ++---
target/cris/translate.c | 7 +++--
target/cris/translate_v10.c.inc | 2 --
target/ppc/misc_helper.c | 5 ----
target/sh4/translate.c | 3 ---
ui/vnc-enc-tight.c | 1 -
util/qemu-timer.c | 2 +-
util/trace-events | 6 ++---
util/vfio-helpers.c | 4 +--
51 files changed, 112 insertions(+), 153 deletions(-)