diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-07-31 12:12:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-31 12:13:21 +0200 |
| commit | adb334d17858d8b679a41f7f2cd230e5c6accc0a (patch) | |
| tree | fd4fd188aedd4412b6d1097eb58e0a479bb97596 /arch/x86/kernel/alternative.c | |
| parent | x86/kvm: Use __xfer_to_guest_mode_work_pending() in kvm_run_vcpu() (diff) | |
| parent | Merge branch 'locking/nmi' into x86/entry (diff) | |
| download | linux-adb334d17858d8b679a41f7f2cd230e5c6accc0a.tar.xz linux-adb334d17858d8b679a41f7f2cd230e5c6accc0a.zip | |
Merge branch 'WIP.x86/entry' into x86/entry, to merge the latest generic code and resolve conflicts
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>
Diffstat (limited to 'arch/x86/kernel/alternative.c')
0 files changed, 0 insertions, 0 deletions