git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0a986ea 659caaf)
Merge branch 'linus' into perf/kprobes
authorIngo Molnar <mingo@kernel.org>
Sat, 7 Nov 2020 11:50:48 +0000 (12:50 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 7 Nov 2020 12:20:17 +0000 (13:20 +0100)
commit666fab4a3ea143315a9c059fad9f3a0f1365d54b
treee9e4be3b0eeac79346d52a86183326617d0c9999tree
parent0a986ea81e1aa8ac17e82cda53cc95158217956ecommit | diff
parent659caaf65dc9c7150aa3e80225ec6e66b25ab3cecommit | diff
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 <mingo@kernel.org>
include/asm-generic/atomic-instrumented.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
kernel/trace/trace_kprobe.c diff1 | diff2 | blob | history
scripts/atomic/gen-atomic-instrumented.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.