From: Linus Torvalds Date: Thu, 22 Mar 2012 16:42:04 +0000 (-0700) Subject: Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.4-rc1~150 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=754b9800779402924fffe456b49d557e15260cbf;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git Merge branch 'x86-mce-for-linus' of git://git./linux/kernel/git/tip/tip Pull MCE changes from Ingo Molnar. * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mce: Fix return value of mce_chrdev_read() when erst is disabled x86/mce: Convert static array of pointers to per-cpu variables x86/mce: Replace hard coded hex constants with symbolic defines x86/mce: Recognise machine check bank signature for data path error x86/mce: Handle "action required" errors x86/mce: Add mechanism to safely save information in MCE handler x86/mce: Create helper function to save addr/misc when needed HWPOISON: Add code to handle "action required" errors. HWPOISON: Clean up memory_failure() vs. __memory_failure() --- 754b9800779402924fffe456b49d557e15260cbf