Il 11/12/2013 01:12, Anthony Liguori ha scritto: > Paolo Bonzini <pbonz...@redhat.com> 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
