Merge commit '
c3ebd3ba786e1be5449527e47001eded6b59322b' into upstream-merge
* commit '
c3ebd3ba786e1be5449527e47001eded6b59322b': (21 commits)
kvm: i386: Add classic PCI device assignment
kvm: i386: Add services required for PCI device assignment
kvm: Introduce kvm_has_intx_set_mask
kvm: Introduce kvm_irqchip_update_msi_route
kvm: Clean up irqfd API
qemu: Use valgrind annotations to mark kvm guest memory as defined
musicpal: Fix flash mapping
Add MAINTAINERS entry for leon3
target-sparc: fix fcmp{s,d,q} instructions wrt exception
target-xtensa: fix missing errno codes for mingw32
target-cris: Fix buffer overflow
MIPS/user: Fix reset CPU state initialization
lan9118: fix multicast filtering
fix entry pointer for ELF kernels loaded with -kernel option
hw/pl110: Fix spelling of 'palette'
target-xtensa: convert host errno values to guest
CHECKPATCH: Add warning for single else statement.
CHECKPATCH: Add --debug adv_apw
CHECKPATCH: Add --debug adv_checking
CHECKPATCH: Add --debug adv_dcs
...
Conflicts:
hw/kvm/pci-assign.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>