Re: linux-next: manual merge of the tip tree with the slab tree

[Pekka Enberg]

On Tue, 2009-06-16 at 09:44 +0200, Ingo Molnar wrote:
> * Pekka Enberg <penberg@xxxxxxxxxxxxxx> wrote:
> 
> > On Tue, 2009-06-16 at 15:46 +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the tip tree got a conflict in mm/slub.c
> > > between commit 964cf35c88f93b4927dbc4e950dfa4d880c7f9d1 ("SLUB: Fix early
> > > boot GFP_DMA allocations") from the slab tree and commit
> > > 18fd427debcf37c06917b55295df682fd05fee76 ("slub: add hooks for
> > > kmemcheck") from the tip tree.
> > > 
> > > I fixed it up (see below) and can carry the fix as necessary.
> > 
> > Looks good! Thanks.
> 
> Btw., this SLAB commit is for this merge window, right?

Yes, it's a fix for SLUB that's going to be part of the next pull
request (probably out today or tomorrow).

			Pekka

--
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/