diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-11-07 14:50:48 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-11-07 15:20:17 +0300 |
| commit | 666fab4a3ea143315a9c059fad9f3a0f1365d54b (patch) | |
| tree | e9e4be3b0eeac79346d52a86183326617d0c9999 /lib/parman.c | |
| parent | 0a986ea81e1aa8ac17e82cda53cc95158217956e (diff) | |
| parent | 659caaf65dc9c7150aa3e80225ec6e66b25ab3ce (diff) | |
| download | linux-666fab4a3ea143315a9c059fad9f3a0f1365d54b.tar.xz | |
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>
Diffstat (limited to 'lib/parman.c')
0 files changed, 0 insertions, 0 deletions