diff options
| author | Ingo Molnar <[email protected]> | 2020-11-07 11:50:48 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2020-11-07 12:20:17 +0000 |
| commit | 666fab4a3ea143315a9c059fad9f3a0f1365d54b (patch) | |
| tree | e9e4be3b0eeac79346d52a86183326617d0c9999 /fs/proc/array.c | |
| parent | Merge branch 'linus' into perf/kprobes (diff) | |
| parent | Merge tag 'ceph-for-5.10-rc3' of git://github.com/ceph/ceph-client (diff) | |
| download | kernel-666fab4a3ea143315a9c059fad9f3a0f1365d54b.tar.gz kernel-666fab4a3ea143315a9c059fad9f3a0f1365d54b.zip | |
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]>
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions