Ingo Molnar f87032aec4 Merge branch 'locking/nmi' into x86/entry ...

Resolve conflicts with ongoing lockdep work that fixed the NMI entry code.

Conflicts:
	arch/x86/entry/common.c
	arch/x86/include/asm/idtentry.h

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

2020-07-26 18:26:25 +02:00

8.0 KiB

Raw Blame History

View Raw