• Linus Torvalds's avatar
    Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a43de489
    Linus Torvalds authored
    Pull ras fixes from Thomas Gleixner:
     "A set of fixes for RAS/MCE:
    
       - Improve the error message when the kernel cannot recover from a MCE
         so the maximum amount of information gets provided.
    
       - Individually check MCE recovery features on SkyLake CPUs instead of
         assuming none when the CAPID0 register does not advertise the
         general ability for recovery.
    
       - Prevent MCE to output inconsistent messages which first show an
         error location and then claim that the source is unknown.
    
       - Prevent overwriting MCi_STATUS in the attempt to gather more
         information when a fatal MCE has alreay been detected. This leads
         to empty status values in the printout and failing to react
         promptly on the fatal event"
    
    * 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/mce: Fix incorrect "Machine check from unknown source" message
      x86/mce: Do not overwrite MCi_STATUS in mce_no_way_out()
      x86/mce: Check for alternate indication of machine check recovery on Skylake
      x86/mce: Improve error message when kernel cannot recover
    a43de489
mce.c 57.2 KB