]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2022b52 02be6f0)
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)
commitad80881c674612c759d44a353965eb0f844233b5
treefd4fd188aedd4412b6d1097eb58e0a479bb97596tree | snapshot
parent2022b52252c85c06cae7b677b55cd0db59a61f50commit | diff
parent02be6f0c7b0fb645b159347fbb6c6521f1c7d6c7commit | diff
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>
Linux Kernel Source Tree.