Merge branch 'linus' into tracing/core

Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc include/linux/ftrace_event.h
index 26d3673d51430f4831c687040001972bf6851343,a81170de7f6bf4907faf644495831aad0c8fc30a..ac8c6f8cf242e39bd6e489221f91014dbfe10d55
--- 1/include/linux/ftrace_event.h
--- 2/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@@ -118,14 -118,12 +120,12 @@@ struct ftrace_event_call 
        int                     (*define_fields)(void);
        struct list_head        fields;
        int                     filter_active;
 -      void                    *filter;
 +      struct event_filter     *filter;
        void                    *mod;
  
- #ifdef CONFIG_EVENT_PROFILE
-       atomic_t        profile_count;
-       int             (*profile_enable)(struct ftrace_event_call *);
-       void            (*profile_disable)(struct ftrace_event_call *);
- #endif
+       atomic_t                profile_count;
+       int                     (*profile_enable)(struct ftrace_event_call *);
+       void                    (*profile_disable)(struct ftrace_event_call *);
  };
  
  #define MAX_FILTER_PRED               32

diff --cc include/trace/ftrace.h
Simple merge

diff --cc kernel/kprobes.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_events.c
Simple merge

diff --cc kernel/trace/trace_functions_graph.c
Simple merge

diff --cc kernel/trace/trace_stack.c
Simple merge

diff --cc kernel/trace/trace_stat.c
Simple merge

diff --cc scripts/recordmcount.pl
Simple merge