aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-03-19 15:46:17 +1100
committerIngo Molnar <mingo@elte.hu>2009-04-02 00:50:30 +0200
commit645dae969c3b8651c5bc7c54a1835ec03820f85f (patch)
treebcc9a1fb2c9aa62696980209d751f8493fdefb12 /arch/x86
parenta095bdbb136f7bed96b7adf5aa1dd27bb2f839bf (diff)
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>
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions