tree 6b179c9aa84787773cb601a14a64255e2912154b
parent b6bea24d41519e8c31e4798f1c1a3f67e540c5d0
parent f0178fc01fe46bab6a95415f5647d1a74efcad1b
author Thomas Gleixner <tglx@linutronix.de> 1591881477 +0200
committer Thomas Gleixner <tglx@linutronix.de> 1591881477 +0200

Merge branch 'x86/entry' into ras/core

to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.