On Fri, 2009-02-20 at 16:57 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the slab tree got a conflict in mm/slub.c
> between commit 5b882be4e00e53a44f47ad7eb997cac2938848bf ("kmemtrace: SLUB
> hooks") from the ftrace tree and commit
> 8573e12414365585bfd601dc8c093b3efbef8854 ("SLUB: Do not pass 8k objects
> through to the page allocator") from the slab tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me! Thanks once again Stephen!
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
