From: Ingo Molnar Date: Fri, 31 Jul 2020 10:12:21 +0000 (+0200) Subject: Merge branch 'WIP.x86/entry' into x86/entry, to merge the latest generic code and... X-Git-Tag: v5.9-rc1~154^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adb334d17858d8b679a41f7f2cd230e5c6accc0a;p=thirdparty%2Fkernel%2Flinux.git 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 --- adb334d17858d8b679a41f7f2cd230e5c6accc0a