|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [qemu-xen stable-4.13] Merge tag 'v4.1.1' of https://git.qemu.org/git/qemu into HEAD
commit 2865b67da41570c5acbb0e0761535b0401a8a54a
Merge: 933ebad2470a169504799a1d95b8e410bd9847ef
99c5874a9b6c9f70aef285d6eff85d4f46de3c52
Author: Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Tue Apr 14 18:33:00 2020 +0100
Commit: Anthony PERARD <anthony.perard@xxxxxxxxxx>
CommitDate: Tue Apr 14 18:33:00 2020 +0100
Merge tag 'v4.1.1' of https://git.qemu.org/git/qemu into HEAD
Fix conflict in hw/xen/xen-bus.c. Basically ignore 4.1.1 version and
use the version of the file already in qemu-xen as it has more patches
applied.
Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
VERSION | 2 +-
block/backup.c | 17 +-
block/create.c | 6 +-
block/curl.c | 125 +-
block/file-posix.c | 200 +-
block/io.c | 413 +-
block/mirror.c | 19 +-
block/nfs.c | 6 +-
block/qcow2-bitmap.c | 14 +-
block/qcow2-cluster.c | 12 +-
block/qcow2-refcount.c | 2 +
block/qcow2.c | 9 +-
block/qcow2.h | 2 +-
block/snapshot.c | 26 +-
block/vpc.c | 3 +-
blockjob.c | 17 +-
contrib/libvhost-user/libvhost-user.c | 3 +-
dma-helpers.c | 13 +-
hw/arm/boot.c | 2 +
hw/block/dataplane/virtio-blk.c | 3 +
hw/core/loader.c | 2 +-
hw/i386/pc.c | 14 +-
hw/ide/ahci.c | 3 -
hw/ide/core.c | 14 -
hw/net/virtio-net.c | 27 +-
hw/s390x/s390-pci-bus.c | 7 +-
hw/scsi/lsi53c895a.c | 41 +-
hw/virtio/vhost.c | 9 +-
hw/virtio/virtio.c | 7 +
include/block/block_int.h | 4 +
include/exec/memory.h | 14 +-
include/hw/virtio/virtio-net.h | 2 +
include/hw/virtio/virtio.h | 6 +
include/qemu/coroutine.h | 15 +
include/qemu/hbitmap.h | 5 +
include/qemu/iov.h | 9 +-
net/colo-compare.c | 6 +-
net/vhost-user.c | 4 +
roms/Makefile.edk2 | 7 +-
scripts/make-release | 8 +
scsi/pr-manager.c | 1 -
target/alpha/helper.c | 4 +-
target/arm/translate-vfp.inc.c | 7 +-
target/arm/translate.c | 21 +-
target/s390x/translate_vx.inc.c | 2 +-
target/xtensa/core-test_mmuhifi_c3.c | 3 +-
target/xtensa/core-test_mmuhifi_c3/core-isa.h | 116 +-
.../xtensa/core-test_mmuhifi_c3/gdb-config.inc.c | 114 +-
.../core-test_mmuhifi_c3/xtensa-modules.inc.c | 6384 ++++++++++----------
tests/acceptance/pc_cpu_hotplug_props.py | 35 +
tests/qemu-iotests/030 | 3 +-
tests/qemu-iotests/040 | 3 +-
tests/qemu-iotests/041 | 3 +-
tests/qemu-iotests/044 | 3 +-
tests/qemu-iotests/045 | 3 +-
tests/qemu-iotests/055 | 3 +-
tests/qemu-iotests/056 | 3 +-
tests/qemu-iotests/057 | 3 +-
tests/qemu-iotests/059.out | 2 +-
tests/qemu-iotests/065 | 3 +-
tests/qemu-iotests/096 | 3 +-
tests/qemu-iotests/118 | 3 +-
tests/qemu-iotests/124 | 3 +-
tests/qemu-iotests/129 | 3 +-
tests/qemu-iotests/132 | 3 +-
tests/qemu-iotests/139 | 3 +-
tests/qemu-iotests/147 | 5 +-
tests/qemu-iotests/148 | 3 +-
tests/qemu-iotests/150.out | 11 -
tests/qemu-iotests/150.out.qcow2 | 11 +
tests/qemu-iotests/150.out.raw | 12 +
tests/qemu-iotests/151 | 3 +-
tests/qemu-iotests/152 | 3 +-
tests/qemu-iotests/155 | 3 +-
tests/qemu-iotests/163 | 3 +-
tests/qemu-iotests/165 | 3 +-
tests/qemu-iotests/169 | 3 +-
tests/qemu-iotests/175 | 19 +-
tests/qemu-iotests/175.out | 8 +-
tests/qemu-iotests/178.out.qcow2 | 4 +-
tests/qemu-iotests/196 | 3 +-
tests/qemu-iotests/199 | 3 +-
tests/qemu-iotests/205 | 3 +-
tests/qemu-iotests/221.out | 12 +-
tests/qemu-iotests/245 | 3 +-
tests/qemu-iotests/253.out | 12 +-
tests/qemu-iotests/265 | 67 +
tests/qemu-iotests/265.out | 6 +
tests/qemu-iotests/266 | 153 +
tests/qemu-iotests/266.out | 137 +
tests/qemu-iotests/267 | 168 +
tests/qemu-iotests/267.out | 182 +
tests/qemu-iotests/270 | 83 +
tests/qemu-iotests/270.out | 9 +
tests/qemu-iotests/272 | 79 +
tests/qemu-iotests/272.out | 10 +
tests/qemu-iotests/common.filter | 11 +-
tests/qemu-iotests/common.rc | 20 +
tests/qemu-iotests/group | 5 +
tests/qemu-iotests/iotests.py | 42 +-
tests/test-hbitmap.c | 2 +-
tests/test-util-filemonitor.c | 43 +-
ui/cocoa.m | 12 +
util/hbitmap.c | 12 +
util/iov.c | 143 +-
105 files changed, 5372 insertions(+), 3771 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.13
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |