Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue

[Paolo Bonzini]

Il 18/12/2012 23:39, Anthony Liguori ha scritto:
>> > And how does it conflicts with Alex's ppc pull request? It is a fast
>> > forward from origin/master as of now (commit a8a826a, exec: refactor
>> > cpu_restore_state, 2012-12-04), and that includes Alex's commits...
> Something from the e500 changes because hw/ppc/e500.c and
> hw/ppc/e500plat.c broke after the merge.
> 
> But since it was the wrong tree, maybe your new branch will not have
> this problem.
> 
> It was easy to fix, so don't worry about it.  I can resolve as a merge
> conflict if needed.

Pushed.

Paolo