Ingo Molnar 666fab4a3e 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: 645f224e7b: ("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>		2020-11-07 13:20:17 +01:00
..
fallbacks	locking/atomics: Flip fallbacks and instrumentation	2020-06-11 08:03:24 +02:00
atomic-tbl.sh	locking/atomics: Change 'fold' to 'grep'	2019-02-11 14:27:33 +01:00
atomics.tbl	locking/atomics: Fix scripts/atomic/ script permissions	2018-11-01 12:45:46 +01:00
check-atomics.sh	locking/atomics: Check atomic-arch-fallback.h too	2020-10-07 18:14:14 +02:00
gen-atomic-fallback.sh	asm-generic/atomic: Add try_cmpxchg() fallbacks	2020-10-12 18:27:27 +02:00
gen-atomic-instrumented.sh	Merge branch 'linus' into perf/kprobes	2020-11-07 13:20:17 +01:00
gen-atomic-long.sh	asm-generic/atomic: Use __always_inline for pure wrappers	2020-01-07 07:47:23 -08:00
gen-atomics.sh	locking/atomics: Flip fallbacks and instrumentation	2020-06-11 08:03:24 +02:00