Subject: linux-next: manual merge of the tip tree with the tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 17 Aug 2009 16:50:51 +1000

Hi all,

Today's linux-next merge of the tip tree got a conflict in
kernel/trace/trace.h between commit
9ec04da7489d2c9ae01ea6e9b5fa313ccf3d35fb ("net: skb ftracer - Add actual
ftrace code to kernel (v3)") from the net tree and commit
64c12e0444fcc6b75eb49144ba46d43dbdc6bc8f ("tracing: Add individual
syscalls tracepoint id support") from the tip tree.

Just overlapping additions/removals.  I fixed it up (see below) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc kernel/trace/trace.h
index 8a6281b,300ef78..0000000
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -336,12 -317,6 +334,8 @@@ extern void __ftrace_bad_type(void)
  			  TRACE_KMEM_ALLOC);	\
  		IF_ASSIGN(var, ent, struct kmemtrace_free_entry,	\
  			  TRACE_KMEM_FREE);	\
- 		IF_ASSIGN(var, ent, struct syscall_trace_enter,		\
- 			  TRACE_SYSCALL_ENTER);				\
- 		IF_ASSIGN(var, ent, struct syscall_trace_exit,		\
- 			  TRACE_SYSCALL_EXIT);				\
 +		IF_ASSIGN(var, ent, struct trace_skb_event,		\
 +			  TRACE_SKB_SOURCE);				\
  		__ftrace_bad_type();					\
  	} while (0)