Merge branch 'linus' into perf/kprobes

Conflicts:
	include/asm-generic/atomic-instrumented.h
	kernel/kprobes.c

Use the upstream atomic-instrumented.h checksum, and pick
the kprobes version of kernel/kprobes.c, which effectively
reverts this upstream workaround:

  645f224e7ba2: ("kprobes: Tell lockdep about kprobe nesting")

Since the new code *should* be fine without nesting.

Knock on wood ...

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc include/asm-generic/atomic-instrumented.h
Simple merge

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

diff --cc kernel/fork.c
index 53a1f508a097c75c8daa8338d6a6ca2fd9821400,32083db7a2a23e93bf2ed9786c92769a0e9c7136..b9c289d0f4ef422932ea6975623c18f1d4bcec43
--- 1/kernel/fork.c
--- 2/kernel/fork.c
+++ b/kernel/fork.c
@@@ -2161,13 -2187,9 +2187,13 @@@ static __latent_entropy struct task_str
        INIT_LIST_HEAD(&p->thread_group);
        p->task_works = NULL;
  
 +#ifdef CONFIG_KRETPROBES
 +      p->kretprobe_instances.first = NULL;
 +#endif
 +
        /*
         * Ensure that the cgroup subsystem policies allow the new process to be
-        * forked. It should be noted the the new process's css_set can be changed
+        * forked. It should be noted that the new process's css_set can be changed
         * between here and cgroup_post_fork() if an organisation operation is in
         * progress.
         */

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

diff --cc scripts/atomic/gen-atomic-instrumented.sh
Simple merge