From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jun 2021 18:19:40 +0000 (-0700)
Subject: Merge tag 'ras_core_for_v5.14_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: microblaze-v5.15~186
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=f565b20734d32bab5a899123d2c58909dbf46a5d;hp=-c

Merge tag 'ras_core_for_v5.14_rc1' of git://git./linux/kernel/git/tip/tip

Pull x86 RAS updates from Borislav Petkov:

 - Add the required information to the faked APEI-reported mem error so
   that the kernel properly attempts to offline the corresponding page,
   as it does for kernel-detected correctable errors.

 - Fix a typo in AMD's error descriptions.

* tag 'ras_core_for_v5.14_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  EDAC/mce_amd: Fix typo "FIfo" -> "Fifo"
  x86/mce: Include a MCi_MISC value in faked mce logs
  x86/MCE/AMD, EDAC/mce_amd: Add new SMCA bank types
---

f565b20734d32bab5a899123d2c58909dbf46a5d