On Wed, Apr 01, 2009 at 11:37:40AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tracing tree got a conflict in
> arch/parisc/include/asm/ftrace.h between commit
> d75f054a2cf0614ff63d534ff21ca8eaab41e713 ("parisc: add ftrace (function
> and graph tracer) functionality") from the parisc tree and commit
> c79a61f55773d2519fd0525bf58385f7d20752d3 ("tracing: make CALLER_ADDRx
> overwriteable") from the tracing tree.
>
> The former adds a non-trivial version of the file, so I used that.
>
Thanks Stephen,
What's the optimal way to sort out multiple branches in this tree?
Apparently Andrew is cross with me because the rtc-parisc branch didn't
get picked up... Should I put a list of branches in my kernel.org
public_html or something?
r, Kyle
--
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
