Re: linux-next: manual merge of the ftrace tree with Linus' tree

From: Steven Rostedt
Date: Mon Mar 18 2013 - 09:26:33 EST

On Mon, 2013-03-18 at 13:00 +1100, Stephen Rothwell wrote:
> Hi Steven,
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/trace/ftrace.c between commit b67bfe0d42ca ("hlist: drop the node
> parameter from iterators") from Linus' tree and commit e1df4cb682ab
> ("ftrace: Fix function probe to only enable needed functions") from the
> ftrace tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks fine, thanks.

-- Steve

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