Re: [Qemu-devel] [PATCH v4 00/23] Power Architecture AREG0 conversion, rebased

[Alexander Graf]

On 30.05.2012, at 19:32, Blue Swirl wrote:

> On Wed, May 30, 2012 at 2:23 PM, Andreas Färber <address@hidden> wrote:
>> Hello Alex,
>> 
>> Here's the mentioned version of your "qemu.areg0" repository (considered v3),
>> including your fixed-up version of Blue's AREG0 v2 conversion and François'
>> ppc 440 TLB dump, rebased onto qom-next.
> 
> Many thanks for rebasing.
> 
>> Conflicts were removal of cpu_state_reset() and change of cpu_ppc_init()
>> return type on qom-next, both expected to be merged in the first qom-next 
>> PULL
>> once the 1.2 merge window opens.
> 
> So qom-next should go in first, then ppc-next?

Maybe it's time we split 1.2 off into its own branch and reopen master to get 
rid of all these merge conflicts? :)


Alex