subject:"\[kvm\-devel\] vmwarevga merge clash"

Re: [kvm-devel] vmwarevga merge clash

2008-03-19 Thread Avi Kivity

Anthony Liguori wrote: Avi Kivity wrote: Trying to merge qemu-cvs, there's a conflict in vmwarevga between two changes that appear to be identical in purpose, only implemented differently: 6d262b07a2046ed1fa0ec3fd61f00efbfcd5a9ef (master) and 5aa90452c52e3a914e1f6bbf34331507fd7c5d52

[kvm-devel] vmwarevga merge clash

2008-03-18 Thread Avi Kivity

Trying to merge qemu-cvs, there's a conflict in vmwarevga between two changes that appear to be identical in purpose, only implemented differently: 6d262b07a2046ed1fa0ec3fd61f00efbfcd5a9ef (master) and 5aa90452c52e3a914e1f6bbf34331507fd7c5d52 (qemu-cvs). I think the correct action is to drop

Re: [kvm-devel] vmwarevga merge clash

2008-03-18 Thread Anthony Liguori

Avi Kivity wrote: Trying to merge qemu-cvs, there's a conflict in vmwarevga between two changes that appear to be identical in purpose, only implemented differently: 6d262b07a2046ed1fa0ec3fd61f00efbfcd5a9ef (master) and 5aa90452c52e3a914e1f6bbf34331507fd7c5d52 (qemu-cvs). I think the