Merge branch 'x86/entry' into ras/core
authorThomas Gleixner <tglx@linutronix.de>
Thu, 11 Jun 2020 13:17:57 +0000 (15:17 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 11 Jun 2020 13:17:57 +0000 (15:17 +0200)
commitf77d26a9fc525286bcef3d4f98b52e17482cf49c
tree6b179c9aa84787773cb601a14a64255e2912154b
parentb6bea24d41519e8c31e4798f1c1a3f67e540c5d0
parentf0178fc01fe46bab6a95415f5647d1a74efcad1b
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.
arch/x86/include/asm/mce.h
arch/x86/kernel/cpu/mce/amd.c
arch/x86/kernel/cpu/mce/core.c
arch/x86/kernel/cpu/mce/internal.h
drivers/edac/amd64_edac.c
drivers/edac/skx_common.c
drivers/hwmon/k10temp.c
include/linux/pci_ids.h