|
From: | Paolo Bonzini |
Subject: | Re: [Qemu-devel] [PULL 00/30] virtio conversion to realize and hotplug/unplug fixes |
Date: | Wed, 11 Dec 2013 08:45:19 +0100 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130923 Thunderbird/17.0.9 |
Il 11/12/2013 01:12, Anthony Liguori ha scritto: > Paolo Bonzini <address@hidden> writes: > >> Anthony, >> >> the following changes since commit 7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e: >> >> Open 2.0 development tree (2013-11-27 14:02:45 -0800) > > This also conflicts badly. This doesn't conflict here either. What files are conflicting exactly? Paolo
[Prev in Thread] | Current Thread | [Next in Thread] |