]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
projects / qemu-xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 933ebad 99c5874)
Merge tag 'v4.1.1' of https://git.qemu.org/git/qemu into HEAD
authorAnthony PERARD <anthony.perard@citrix.com>
Tue, 14 Apr 2020 17:33:00 +0000 (18:33 +0100)
committerAnthony PERARD <anthony.perard@citrix.com>
Tue, 14 Apr 2020 17:33:00 +0000 (18:33 +0100)
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@citrix.com>

Trivial merge
qemu-xen (upstream qemu) tree.