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: NIngo Molnar <mingo@kernel.org>
Showing
include/linux/lockdep_types.h
0 → 100644
想要评论请 注册 或 登录