Ingo Molnar a500fc918f Merge branch 'locking/core' into x86/mm, to resolve conflict ...

There's a non-trivial conflict between the parallel TLB flush
framework and the IPI flush debugging code - merge them
manually.

Conflicts:
	kernel/smp.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2021-03-06 13:00:58 +01:00

33 KiB

Raw Blame History

View Raw