On 06/12/2015 07:31 AM, Claudio Fontana wrote: > Hello Markus, > > the merge conflict resolution is the following: >
> > Or do you want me to respin based on an uncommited state of master + > "remove ENV_GET_CPU" series? Probably easiest to just post a v7 with RFC dropped and all resolution performed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature