Skip to contentSkip to conversation

RAS pile for 5.6

GIT PULL Merged Borislav Petkov 2 participants 2 messages Jan 27, 2020 EDAC-core

lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull the below branch to receive the following RAS updates:

* Misc fixes to the MCA code all over the place, by Jan H. Schönherr.

* Initial support for AMD F19h and other cleanups to amd64_edac, by Yazen Ghannam.

* Other small cleanups.

Thx.

---

The following changes since commit 7de7de7ca0ae0fc70515ee3154af33af75edae2c:

Fix root mounting with no mount options (2019-12-16 08:42:39 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ras-core-for-linus

for you to fetch changes up to 86e9f9d60eb5e0c5d99ddf6b79f4d308d6453bd0:

EDAC/mce_amd: Make fam_ops static global (2020-01-16 21:52:48 +0100)

----------------------------------------------------------------
Arnd Bergmann (1):
x86/mce/therm_throt: Mark throttle_active_work() as __maybe_unused

Borislav Petkov (1):
EDAC/mce_amd: Make fam_ops static global

Jan H. Schönherr (5):
x86/mce: Pass MCE message to mce_panic() on failed kernel recovery x86/mce: Remove mce_inject_log() in favor of mce_log() x86/mce: Take action on UCNA/Deferred errors again x86/mce: Fix mce=nobootlog
x86/mce: Fix use of uninitialized MCE message string

Yazen Ghannam (5):
x86/MCE/AMD, EDAC/mce_amd: Add new Load Store unit McaType EDAC/mce_amd: Always load on SMCA systems x86/amd_nb: Add Family 19h PCI IDs
EDAC/amd64: Add family ops for Family 19h Models 00h-0Fh EDAC/amd64: Drop some family checks for newer systems

 arch/x86/include/asm/mce.h            |   3 +-
 arch/x86/kernel/amd_nb.c              |   3 +
 arch/x86/kernel/cpu/mce/amd.c         |   2 +
 arch/x86/kernel/cpu/mce/core.c        |  70 ++++++++++-------------
 arch/x86/kernel/cpu/mce/inject.c      |   2 +-
 arch/x86/kernel/cpu/mce/internal.h    |   2 -
 arch/x86/kernel/cpu/mce/therm_throt.c |   2 +-
 drivers/edac/amd64_edac.c             |  62 +++++++++++---------
 drivers/edac/amd64_edac.h             |   3 +
 drivers/edac/mce_amd.c                | 105 ++++++++++++++++++++--------------
 include/linux/pci_ids.h               |   1 +
 11 files changed, 141 insertions(+), 114 deletions(-)
Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 27 Jan 2020 12:17:55 +0100:

The pull request you sent on Mon, 27 Jan 2020 12:17:55 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ras-core-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/30f5a75640998900d995e099e060e920e72790b2

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker