* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/trace/ring_buffer.c between commit
> 4f5a7f40ddbae98569acbb99118a98570315579c ("ftrace: prevent recursion")
> from Linus' tree and commit 182e9f5f704ed6b9175142fe8da33c9ce0c52b52
> ("ftrace: insert in the ftrace_preempt_disable()/enable() functions")
> from the ftrace tree.
Correct.
As usual, you can save yourself some work and take a look into or
double-check tip/master for such resolutions - i pushed this conflict
resolution out 4 days ago:
| commit 9e418deb22f9b19607823b1830a79138ebb3bd3c
| Merge: d477d0d... 4f5a7f4...
| Author: Ingo Molnar <mingo@xxxxxxx>
| Date: Thu Nov 27 10:13:12 2008 +0100
|
| Merge branch 'tracing/urgent'
|
| Conflicts:
| kernel/trace/ring_buffer.c
(I shield you from most conflicts but it's not always possible and in 99%
of the cases there's a resolution in tip/master already.)
> I am pretty sure that the latter supercedes the former, so I used that
> version. Please fix this conflict up in the ftrace tree soon.
Now that it has hit Linus's tree a couple of hours ago, i pushed it out
into the ftrace-next tree as well.
Thanks Stephen,
Ingo
--
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
