From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Mar 2009 04:46:17 +0000 (+1100)
Subject: tracing, net: fix net tree and tracing tree merge interaction
X-Git-Tag: v2.6.30-rc1~203^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=645dae969c3b8651c5bc7c54a1835ec03820f85f;p=pandora-kernel.git

tracing, net: fix net tree and tracing tree merge interaction

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

 In file included from net/core/skbuff.c:69:
 include/trace/skb.h:4: error: expected ')' before '(' token
 include/trace/skb.h:4: error: expected ')' before '(' token
 [...]

Caused by commit 2939b0469d04ba9ac791aca9a81625d7eb50662b ("tracing:
replace TP<var> with TP_<var>") from the tracing tree interacting with
commit 4893d39e865b2897bf9fcd329697d37032d853a1 ("Network Drop Monitor:
Add trace declaration for skb frees") from the net tree.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

Reading git-diff-tree failed