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

From: Ananth N Mavinakayanahalli <[email-masked]>
Date: Tue, 22 Jul 2008 17:59:45 +0530

On Tue, Jul 22, 2008 at 01:56:42PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got conflicts in
> lib/Kconfig.debug against Linus' tree.
> 
> I have been carrying the fix to these conflicts for a while but no that
> they are in Linus' tree, you should rebase/merge your tree against his
> and carefully check/test the results.
> 
> My current fixup patch to your tests/Kconfig is below.  It may not be
> complete.

Thanks Stephen!

Sam,

Can you please request Linus to pull the tests tree now that 2.6.27
window is open?

Thanks,
Ananth