diff options
author | Linus Torvalds | 2019-03-08 18:11:39 +0100 |
---|---|---|
committer | Linus Torvalds | 2019-03-08 18:11:39 +0100 |
commit | e13284da944df29ab08e8a9d2a50fc0ad1d858ab (patch) | |
tree | 8e6e2580d27cf4fe5f712e0857dc495aa52fd27e /init/initramfs.c | |
parent | Merge tag 'edac_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
parent | x86/mce: Improve error message when kernel cannot recover, p2 (diff) | |
download | kernel-qcow2-linux-e13284da944df29ab08e8a9d2a50fc0ad1d858ab.tar.gz kernel-qcow2-linux-e13284da944df29ab08e8a9d2a50fc0ad1d858ab.tar.xz kernel-qcow2-linux-e13284da944df29ab08e8a9d2a50fc0ad1d858ab.zip |
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS updates from Borislav Petkov:
"This time around we have in store:
- Disable MC4_MISC thresholding banks on all AMD family 0x15 models
(Shirish S)
- AMD MCE error descriptions update and error decode improvements
(Yazen Ghannam)
- The usual smaller conversions and fixes"
* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Improve error message when kernel cannot recover, p2
EDAC/mce_amd: Decode MCA_STATUS in bit definition order
EDAC/mce_amd: Decode MCA_STATUS[Scrub] bit
EDAC, mce_amd: Print ExtErrorCode and description on a single line
EDAC, mce_amd: Match error descriptions to latest documentation
x86/MCE/AMD, EDAC/mce_amd: Add new error descriptions for some SMCA bank types
x86/MCE/AMD, EDAC/mce_amd: Add new McaTypes for CS, PSP, and SMU units
x86/MCE/AMD, EDAC/mce_amd: Add new MP5, NBIO, and PCIE SMCA bank types
RAS: Add a MAINTAINERS entry
RAS: Use consistent types for UUIDs
x86/MCE/AMD: Carve out the MC4_MISC thresholding quirk
x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models
x86/MCE: Switch to use the new generic UUID API
Diffstat (limited to 'init/initramfs.c')
0 files changed, 0 insertions, 0 deletions