diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-30 11:27:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-30 11:27:49 -0700 |
commit | 4b5e35ce075817bc36d7c581b22853be984e5b41 (patch) | |
tree | ecd26153bdfeeb0d43a65e9fdbe12d760f69b2ef /MAINTAINERS | |
parent | e60d726f5d8ccc85f18b9f1f6839112dc8c58fb8 (diff) | |
parent | 0a9ece9ba154dd6205709108180952c55e630833 (diff) | |
download | linux-4b5e35ce075817bc36d7c581b22853be984e5b41.tar.gz |
Merge tag 'edac_updates_for_v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC updates from Tony Luck: "Various fixes and support for new CPUs: - Clean up error messages from thunderx_edac - Add MODULE_DEVICE_TABLE to ti_edac so it will autoload - Use %pR to print resources in aspeed_edac - Add Yazen Ghannam as MAINTAINER for AMD edac drivers - Fix Ice Lake and Sapphire Rapids drivers to report correct "near" or "far" device for errors in 2LM configurations - Add support of on package high bandwidth memory in Sapphire Rapids - New CPU support for three CPUs supporting in-band ECC (IOT SKUs for ICL-NNPI, Tiger Lake and Alder Lake) - Don't even try to load Intel EDAC drivers when running as a guest - Fix Kconfig dependency on X86_MCE_INTEL for EDAC_IGEN6" * tag 'edac_updates_for_v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: EDAC/igen6: fix core dependency EDAC/Intel: Do not load EDAC driver when running as a guest EDAC/igen6: Add Intel Alder Lake SoC support EDAC/igen6: Add Intel Tiger Lake SoC support EDAC/igen6: Add Intel ICL-NNPI SoC support EDAC/i10nm: Add support for high bandwidth memory EDAC/i10nm: Add detection of memory levels for ICX/SPR servers EDAC/skx_common: Add new ADXL components for 2-level memory MAINTAINERS: Make Yazen Ghannam maintainer for EDAC-AMD64 EDAC/aspeed: Use proper format string for printing resource EDAC/ti: Add missing MODULE_DEVICE_TABLE EDAC/thunderx: Remove irrelevant variable from error messages
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 17a5335f61f0..cb3510c365c8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6467,10 +6467,11 @@ F: Documentation/filesystems/ecryptfs.rst F: fs/ecryptfs/ EDAC-AMD64 -M: Borislav Petkov <bp@alien8.de> +M: Yazen Ghannam <yazen.ghannam@amd.com> L: linux-edac@vger.kernel.org -S: Maintained +S: Supported F: drivers/edac/amd64_edac* +F: drivers/edac/mce_amd* EDAC-ARMADA M: Jan Luebbe <jlu@pengutronix.de> |