diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-07-25 11:14:55 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-26 19:26:25 +0300 |
| commit | f87032aec41e0b00ae5fa9103eb8e7b2d1f8416b (patch) | |
| tree | a97529fda2762270084c18958c269c3e2633463d /arch/x86/include/asm/sparsemem.h | |
| parent | d25c8be67481aaaa060782d7e8b84bc0d0355922 (diff) | |
| parent | ba1f2b2eaa2a529dba722507c55ff3d761d325dd (diff) | |
| download | linux-f87032aec41e0b00ae5fa9103eb8e7b2d1f8416b.tar.xz | |
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>
Diffstat (limited to 'arch/x86/include/asm/sparsemem.h')
0 files changed, 0 insertions, 0 deletions