Merge remote-tracking branch 'ftrace/for-next'

Conflicts:
	kernel/trace/ftrace.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc kernel/trace/Kconfig
Simple merge

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

diff --cc kernel/trace/ftrace.c
index ab25b88aae56f4e22380766b02378669c8b05c57,25770824598f8fc5b498d2134715680a404b915c..dfd33f0172a183c7c446eb2a5bb44a715ece58b3
--- 1/kernel/trace/ftrace.c
--- 2/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -3063,8 -3087,13 +3083,13 @@@ static voi
  __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
                                  void *data, int flags)
  {
+       struct ftrace_func_entry *rec_entry;
        struct ftrace_func_probe *entry;
 -      struct hlist_node *n, *tmp;
+       struct ftrace_func_probe *p;
+       struct ftrace_hash **orig_hash = &trace_probe_ops.filter_hash;
+       struct list_head free_list;
+       struct ftrace_hash *hash;
 +      struct hlist_node *tmp;
        char str[KSYM_SYMBOL_LEN];
        int type = MATCH_FULL;
        int i, len = 0;

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

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