Merge branch 'WIP.x86/entry' into x86/entry, to merge the latest generic code and...
authorIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2020 10:12:21 +0000 (12:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2020 10:13:21 +0000 (12:13 +0200)
Pick up and resolve the NMI entry code changes from the locking tree,
and also pick up the latest two fixes from tip:core/entry.

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

Trivial merge