Hi Steven,

Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/ftrace.c between commit b67bfe0d42ca ("hlist: drop the node
parameter from iterators") from Linus' tree and commit e1df4cb682ab
("ftrace: Fix function probe to only enable needed functions") from the
ftrace tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/trace/ftrace.c
index ab25b88,2577082..0000000
--- a/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 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 *n, *tmp;
 +	struct hlist_node *tmp;
  	char str[KSYM_SYMBOL_LEN];
  	int type = MATCH_FULL;
  	int i, len = 0;