Merge tag 'mce-recovery-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git...

Implement MCE recovery for the data load error path and assorted cleanups.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc drivers/base/memory.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc mm/memory-failure.c
Simple merge