[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH v4 00/23] Power Architecture AREG0 conversion, reb
From: |
Alexander Graf |
Subject: |
Re: [Qemu-ppc] [PATCH v4 00/23] Power Architecture AREG0 conversion, rebased |
Date: |
Wed, 30 May 2012 20:06:46 +0200 |
On 30.05.2012, at 19:48, Blue Swirl wrote:
> On Wed, May 30, 2012 at 5:33 PM, Alexander Graf <address@hidden> wrote:
>>
>> 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? :)
>
> The freeze has been a bit long. The 1.1 tree has collected a lot of
> nice fixes though.
I'm all for a freeze and hammering out rcs in a separate 1.1 branch, but we
need a single point of upstream for everything else if we want to get the QOM
conversion rolling :)
Alex
- [Qemu-ppc] [PATCH v4 10/23] ppc: Split MMU etc. helpers from op_helper.c, (continued)
- [Qemu-ppc] [PATCH v4 10/23] ppc: Split MMU etc. helpers from op_helper.c, Andreas Färber, 2012/05/30
- [Qemu-ppc] [PATCH v4 08/23] ppc: Split integer and vector ops, Andreas Färber, 2012/05/30
- [Qemu-ppc] [PATCH v4 06/23] ppc: Split FPU and SPE ops, Andreas Färber, 2012/05/30
- [Qemu-ppc] [PATCH v4 13/23] ppc: Move MMU helpers from helper.c to mmu_helper.c, Andreas Färber, 2012/05/30
- [Qemu-ppc] [PATCH v4 01/23] ppc: Fix coding style in op_helper.c, Andreas Färber, 2012/05/30
- Re: [Qemu-ppc] [PATCH v4 00/23] Power Architecture AREG0 conversion, rebased, Blue Swirl, 2012/05/30
- Re: [Qemu-ppc] [PATCH v4 00/23] Power Architecture AREG0 conversion, rebased, Andreas Färber, 2012/05/30