Merge branch 'linus' into perf/kprobes

Merge recent kprobes updates into perf/kprobes that came from -mm.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc include/linux/kprobes.h
index b7824e3,8aab327..a794044
--- 1/include/linux/kprobes.h
--- 2/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@@ -398,7 -371,10 +398,9 @@@ int register_kretprobes(struct kretprob
  void unregister_kretprobes(struct kretprobe **rps, int num);
  
  void kprobe_flush_task(struct task_struct *tk);
 -void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
  
+ void kprobe_free_init_mem(void);
+ 
  int disable_kprobe(struct kprobe *kp);
  int enable_kprobe(struct kprobe *kp);
  

diff --cc kernel/kprobes.c
Simple merge

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