Merge branches 'edac-ghes' and 'edac-misc' into edac-updates-for-v6.2

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fb0a565..3c48522 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -752,7 +752,7 @@ ALIBABA PMU DRIVER
 M:     Shuai Xue <xueshuai@linux.alibaba.com>
 S:     Supported
 F:     Documentation/admin-guide/perf/alibaba_pmu.rst
-F:     drivers/perf/alibaba_uncore_dwr_pmu.c
+F:     drivers/perf/alibaba_uncore_drw_pmu.c
 
 ALIENWARE WMI DRIVER
 L:     Dell.Client.Kernel@dell.com
@@ -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
@@ -15411,7 +15410,7 @@ M:      Stafford Horne <shorne@gmail.com>
 L:     openrisc@lists.librecores.org
 S:     Maintained
 W:     http://openrisc.io
-T:     git git://github.com/openrisc/linux.git
+T:     git https://github.com/openrisc/linux.git
 F:     Documentation/devicetree/bindings/openrisc/
 F:     Documentation/openrisc/
 F:     arch/openrisc/
@@ -17702,6 +17701,7 @@ M:      Palmer Dabbelt <palmer@dabbelt.com>
 M:     Albert Ou <aou@eecs.berkeley.edu>
 L:     linux-riscv@lists.infradead.org
 S:     Supported
+Q:     https://patchwork.kernel.org/project/linux-riscv/list/
 P:     Documentation/riscv/patch-acceptance.rst
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
 F:     arch/riscv/
@@ -17713,12 +17713,13 @@ M:    Conor Dooley <conor.dooley@microchip.com>
 M:     Daire McNamara <daire.mcnamara@microchip.com>
 L:     linux-riscv@lists.infradead.org
 S:     Supported
-F:     Documentation/devicetree/bindings/clock/microchip,mpfs.yaml
+F:     Documentation/devicetree/bindings/clock/microchip,mpfs*.yaml
 F:     Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
 F:     Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml
 F:     Documentation/devicetree/bindings/mailbox/microchip,mpfs-mailbox.yaml
 F:     Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml
 F:     Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml
+F:     Documentation/devicetree/bindings/riscv/microchip.yaml
 F:     Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-sys-controller.yaml
 F:     Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml
 F:     Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
@@ -18515,8 +18516,7 @@ S:      Maintained
 F:     drivers/mmc/host/sdhci-esdhc-imx.c
 
 SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
-M:     Jonathan Derrick <jonathan.derrick@intel.com>
-M:     Revanth Rajashekar <revanth.rajashekar@intel.com>
+M:     Jonathan Derrick <jonathan.derrick@linux.dev>
 L:     linux-block@vger.kernel.org
 S:     Supported
 F:     block/opal_proto.h