diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 09:19:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 09:19:35 -0800 |
| commit | 30f5a75640998900d995e099e060e920e72790b2 (patch) | |
| tree | 5c6ed5c5bf5a20dc2166e195d80fe79d68202277 /arch/um | |
| parent | b62061b82a6e6783bed5f9052326694ba1418bba (diff) | |
| parent | 86e9f9d60eb5e0c5d99ddf6b79f4d308d6453bd0 (diff) | |
| download | linux-30f5a75640998900d995e099e060e920e72790b2.tar.bz2 | |
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS updates from Borislav Petkov:
- Misc fixes to the MCE 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.
* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
EDAC/mce_amd: Make fam_ops static global
EDAC/amd64: Drop some family checks for newer systems
EDAC/amd64: Add family ops for Family 19h Models 00h-0Fh
x86/amd_nb: Add Family 19h PCI IDs
EDAC/mce_amd: Always load on SMCA systems
x86/MCE/AMD, EDAC/mce_amd: Add new Load Store unit McaType
x86/mce: Fix use of uninitialized MCE message string
x86/mce: Fix mce=nobootlog
x86/mce: Take action on UCNA/Deferred errors again
x86/mce: Remove mce_inject_log() in favor of mce_log()
x86/mce: Pass MCE message to mce_panic() on failed kernel recovery
x86/mce/therm_throt: Mark throttle_active_work() as __maybe_unused
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions