]> xenbits.xensource.com Git - qemu-xen.git/commit
projects / qemu-xen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2865b67da41570c5acbb0e0761535b0401a8a54a
tree5d9f7f6e95c1c0249e3a2d410543126f1f3c294btree
parent933ebad2470a169504799a1d95b8e410bd9847efcommit | diff
parent99c5874a9b6c9f70aef285d6eff85d4f46de3c52commit | diff
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@citrix.com>
qemu-xen (upstream qemu) tree.