diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2022-12-12 17:40:03 +0300 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2022-12-12 17:40:03 +0300 |
| commit | 3919430fe93bcfad5e34cdbb4d81cd17b3bbd27a (patch) | |
| tree | 39e094c22f9a55f1461f2ff6815610fb156845a6 /MAINTAINERS | |
| parent | f5e32344d472f1021b9d382333f01b356bc8b8b8 (diff) | |
| parent | 9c8921555907f4d723f01ed2d859b66f2d14f08e (diff) | |
| download | linux-3919430fe93bcfad5e34cdbb4d81cd17b3bbd27a.tar.xz | |
Merge branches 'edac-ghes' and 'edac-misc' into edac-updates-for-v6.2
Combine all queued EDAC changes for submission into v6.2:
* ras/edac-ghes:
EDAC/igen6: Return the correct error type when not the MC owner
apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
EDAC: Check for GHES preference in the chipset-specific EDAC drivers
EDAC/ghes: Make ghes_edac a proper module
EDAC/ghes: Prepare to make ghes_edac a proper module
EDAC/ghes: Add a notifier for reporting memory errors
efi/cper: Export several helpers for ghes_edac to use
* ras/edac-misc:
EDAC/i10nm: fix refcount leak in pci_get_dev_wrapper()
EDAC/i5400: Fix typo in comment: vaious -> various
EDAC/mc_sysfs: Increase legacy channel support to 12
MAINTAINERS: Make Mauro EDAC reviewer
MAINTAINERS: Make Manivannan Sadhasivam the maintainer of qcom_edac
EDAC/i5000: Mark as BROKEN
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cf0f18502372..3c4852298687 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7356,9 +7356,9 @@ F: drivers/edac/thunderx_edac* EDAC-CORE M: Borislav Petkov <bp@alien8.de> -M: Mauro Carvalho Chehab <mchehab@kernel.org> M: Tony Luck <tony.luck@intel.com> R: James Morse <james.morse@arm.com> +R: Mauro Carvalho Chehab <mchehab@kernel.org> R: Robert Richter <rric@kernel.org> L: linux-edac@vger.kernel.org S: Supported @@ -7475,8 +7475,7 @@ S: Maintained F: drivers/edac/pnd2_edac.[ch] EDAC-QCOM -M: Channagoud Kadabi <ckadabi@codeaurora.org> -M: Venkata Narendra Kumar Gutta <vnkgutta@codeaurora.org> +M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> L: linux-arm-msm@vger.kernel.org L: linux-edac@vger.kernel.org S: Maintained |