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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 13 Aug 2008 17:36:17 +1000

Hi Pekka,

On Wed, 13 Aug 2008 10:10:47 +0300 Pekka Enberg <[email-masked]> wrote:
>
> OK, thanks! But what about kmemcheck then? We have conflicts there that 
> won't be resolved until 2.6.28. Does this mean I should grab the 
> kmemcheck patches to my tree now to fix them?

I wouldn't worry about it for now, the conflicts are all trivial.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/