On Tue, 2009-01-20 at 14:57 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the slab tree got a conflict in mm/slob.c
> between commit 3eae2cb24a96509e0a38cc48dc1538a2826f4e33 ("kmemtrace: SLOB
> hooks") from the ftrace tree and commit
> 6e9ed0cc4b963fde66ab47d9fb19147631e44555 ("slob: clean up the code") from
> the slab tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks Stephen.
--
http://selenic.com : development and support for Mercurial and Linux
--
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
