Merge branch 'locking/core' into x86/mm, to resolve conflict

Browse source

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>

...

This commit is contained in:

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

parent d43f17a1da bdb1050ee1

commit a500fc918f

7 changed files with 306 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

18

include/linux/lockdep.h

View file