]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 471290c 5d93e2c)
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)
commit465123f2fb006c778f40c2c99c784d824cb1806f
treefd4fd188aedd4412b6d1097eb58e0a479bb97596tree | snapshot
parent471290c5abf41d2645777abc137f5df378a8a824commit | diff
parent5d93e2c710a7937796b35d582c9de1ced38a9f35commit | 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.