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

From: Pekka Enberg
Date: Tue Jun 16 2009 - 01:48:48 EST

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.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at