| commit | f77d26a9fc525286bcef3d4f98b52e17482cf49c | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Thu Jun 11 15:17:57 2020 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Thu Jun 11 15:17:57 2020 +0200 |
| tree | 6b179c9aa84787773cb601a14a64255e2912154b | |
| parent | b6bea24d41519e8c31e4798f1c1a3f67e540c5d0 [diff] | |
| parent | f0178fc01fe46bab6a95415f5647d1a74efcad1b [diff] |
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.