Re: linux-next: manual merge of the tip-core tree with Linus' tree

From: Darren Hart
Date: Fri May 22 2009 - 14:18:30 EST


Stephen Rothwell wrote:
Hi Darren, Thomas,

On Fri, 22 May 2009 10:19:39 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
I have made the changes you suggested for today since the -tip stuff has
^^^
has not

filtered through yet.

The resolution patch now looks like below.

Looks right at a quick glance. I just updated linux-2.6-tip and checked the "auto-core-next" branch. I appears to have the necessary changes.... I believe since merge 74869023169c6b85383abc66877154a582b35798.

Thanks,

--
Darren Hart
IBM Linux Technology Center
Real-Time Linux Team
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/