[GIT PULL] ARM irqchip consolidation
Marc Zyngier
marc.zyngier at arm.com
Tue Nov 22 06:47:49 EST 2011
Hi Russell,
On 21/11/11 22:00, Russell King - ARM Linux wrote:
> On Thu, Nov 17, 2011 at 06:08:59PM +0000, Marc Zyngier wrote:
>> If you have a stable branch on which I can rebase, I'm happy to do it
>> (I've just resolved these conflicts on -next). If it's more convenient
>> to do it later in the cycle, I can wait. Just let me know what is the
>> most convenient route for you.
>
> I've now merged the restart changes into the 'devel' branch, and then
> followed on with your changes on top of that - fixing the conflicts
> along the way.
>
> I decided not to push it out in the devel-stable branch until you've
> had a chance to verify that the conflict resolution is correct - I've
> added some limited explanations in the merge commit for the two things
> which weren't a trivial resolution. Once you've confirmed it's fine,
> I'll push the stuff over to the devel-stable branch.
I had a quick look at linux-next, and the conflict resolution seem
perfectly sound.
Thanks a lot for going through this, very much appreciated.
M.
--
Jazz is not dead. It just smells funny...
More information about the linux-arm-kernel
mailing list