Subject: Re: linux-next: manual merge of the sparseirq tree

From: Ingo Molnar <[email-masked]>
Date: Thu, 16 Oct 2008 10:13:47 +0200

* Stephen Rothwell <[email-masked]> wrote:

> Hi Ingo,
> 
> Today's linux-next merge of the sparseirq tree got a lot of conflicts 
> with various other trees.  For today, I will drop it and maybe have 
> another look tomorrow when things are (hopefully) less busy. [...]

okay, agreed - i've just reset auto-sparseirq-next to Linus and will 
update it with a merged up tree. (which we have in the works)

> [...] If you could fix up any internal-to-tip and Linus conflicts, 
> that would be great.

no other topic should be conflicting that i know of.

	Ingo