From: Borislav Petkov <[email protected]> Hi,
here's the stuff which got ready in time. The more exciting things are going to wait for the next merge window. :-) Please apply, thanks. Borislav Petkov (8): x86/mce-inject: Make it depend on X86_LOCAL_APIC x86/MCE/therm_throt: Do not log a fake MCE for a thermal event x86/MCE: Flip the TSC-adding logic x86/ras/mce_amd_inj: Change dependency EDAC/mce_amd: Unexport amd_decode_mce() EDAC/mce_amd: Dump TSC value x86/MCE: Get rid of mce_process_work() x86/MCE, EDAC, acpi: Assign MCE notifier handlers a priority Yazen Ghannam (1): x86/MCE/AMD: Make sysfs names of banks more user-friendly arch/x86/Kconfig | 2 +- arch/x86/include/asm/mce.h | 20 ++++++----- arch/x86/kernel/cpu/mcheck/mce-apei.c | 5 ++- arch/x86/kernel/cpu/mcheck/mce-genpool.c | 2 +- arch/x86/kernel/cpu/mcheck/mce-inject.c | 5 +-- arch/x86/kernel/cpu/mcheck/mce-internal.h | 2 +- arch/x86/kernel/cpu/mcheck/mce.c | 57 ++++--------------------------- arch/x86/kernel/cpu/mcheck/mce_amd.c | 9 +++-- arch/x86/kernel/cpu/mcheck/therm_throt.c | 30 ++++++---------- arch/x86/ras/Kconfig | 2 +- drivers/acpi/acpi_extlog.c | 1 + drivers/acpi/nfit/mce.c | 1 + drivers/edac/i7core_edac.c | 1 + drivers/edac/mce_amd.c | 8 +++-- drivers/edac/mce_amd.h | 1 - drivers/edac/sb_edac.c | 3 +- drivers/edac/skx_edac.c | 3 +- 17 files changed, 59 insertions(+), 93 deletions(-) -- 2.11.0
