Merge branch 'locking/nmi' into x86/entry
authorIngo Molnar <mingo@kernel.org>
Sat, 25 Jul 2020 08:14:55 +0000 (10:14 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 26 Jul 2020 16:26:25 +0000 (18:26 +0200)
commitf87032aec41e0b00ae5fa9103eb8e7b2d1f8416b
treea97529fda2762270084c18958c269c3e2633463d
parentd25c8be67481aaaa060782d7e8b84bc0d0355922
parentba1f2b2eaa2a529dba722507c55ff3d761d325dd
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>
arch/x86/entry/common.c
arch/x86/include/asm/idtentry.h
arch/x86/kernel/traps.c