Subject: Re: linux-next: manual merge of the tip-core tree

From: Ingo Molnar <[email-masked]>
Date: Mon, 7 Jul 2008 08:12:32 +0200

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

> Hi all,
> 
> Today's linux-next merge of the tip-core tree got a trivial conflict 
> in kernel/softlockup.c between commit 
> 3b7253238801a7b97b3929d8db2fa7a0721fb17b ("softlockup: print a module 
> list on being stuck") from Linus' tree (which also exists in the 
> tip-core tree) and commit 8d5be7f4e8515af461cbc8f07687ccc81507d508 
> ("softlockup: show irqtrace") from the tip-core tree.
> 
> It is just tha the latter change modifies the section of code modified 
> by the former.  I fixed it up and can carry the fix.

Thanks Stephen - this should be resolved by today's auto-core-next 
iteration as well. (which you'll pick up tomorrow-ish)

	Ingo