Hi Stephen,
On Mon, 2009-01-26 at 15:31 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the slab tree got conflicts in
> include/linux/slub_def.h and mm/slub.c between commit
> 5b882be4e00e53a44f47ad7eb997cac2938848bf ("kmemtrace: SLUB hooks") from
> the ftrace tree and commit 97a4871761e735b6f1acd3bc7c3bac30dae3eab9
> ("SLUB: revert direct page allocator pass through") from the slab tree.
>
> I fixed them up (see below, worth a check) and can carry the fix as
> necessary.
Yup, looks good to me. The kmalloc_large() function is dropped by the
page allocator pass-through revert in linux-next. Thanks!
Pekka
--
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
