Re: Hi Bonzini, I've seen your 3.1 branch have conflict with qemu.org/master

[Paolo Bonzini]

On 20/09/20 16:53, 罗勇刚(Yonggang Luo) wrote:
> I rebased 3.1 branch on  qemu.org/master <http://qemu.org/master> and
> placed at
> https://github.com/lygstate/qemu/tree/for-3.1
> 
> And removed two conflcit revision
> 
> * iotests: Work around failing readlink -f
> * Simplify the .gitignore file
> 
> And test result at here:
> https://cirrus-ci.com/build/4717093432066048

Great, thanks.  I'll send a v2 of the pull request.

Paolo