Skip to content
Commit f87032ae authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
parents d25c8be6 ba1f2b2e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment