Merge branch 'for-6.7/cxl' into cxl/next

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b19995690904aabd6a78514e1c45215b5ae1a8e3..b73d088bd939934111b06468467017e4d8706688 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -294,6 +294,8 @@ F:  drivers/pnp/pnpacpi/
 F:     include/acpi/
 F:     include/linux/acpi.h
 F:     include/linux/fwnode.h
+F:     include/linux/fw_table.h
+F:     lib/fw_table.c
 F:     tools/power/acpi/
 
 ACPI APEI
@@ -1963,12 +1965,12 @@ F:      drivers/irqchip/irq-aspeed-i2c-ic.c
 
 ARM/ASPEED MACHINE SUPPORT
 M:     Joel Stanley <joel@jms.id.au>
-R:     Andrew Jeffery <andrew@aj.id.au>
+R:     Andrew Jeffery <andrew@codeconstruct.com.au>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 S:     Supported
 Q:     https://patchwork.ozlabs.org/project/linux-aspeed/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
 F:     Documentation/devicetree/bindings/arm/aspeed/
 F:     arch/arm/boot/dts/aspeed/
 F:     arch/arm/mach-aspeed/
@@ -3058,7 +3060,7 @@ F:        Documentation/devicetree/bindings/peci/peci-aspeed.yaml
 F:     drivers/peci/controller/peci-aspeed.c
 
 ASPEED PINCTRL DRIVERS
-M:     Andrew Jeffery <andrew@aj.id.au>
+M:     Andrew Jeffery <andrew@codeconstruct.com.au>
 L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 L:     linux-gpio@vger.kernel.org
@@ -3075,7 +3077,7 @@ F:        drivers/irqchip/irq-aspeed-scu-ic.c
 F:     include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
 
 ASPEED SD/MMC DRIVER
-M:     Andrew Jeffery <andrew@aj.id.au>
+M:     Andrew Jeffery <andrew@codeconstruct.com.au>
 L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 L:     linux-mmc@vger.kernel.org
@@ -4082,7 +4084,7 @@ F:        drivers/net/wireless/broadcom/brcm80211/
 
 BROADCOM BRCMSTB GPIO DRIVER
 M:     Doug Berger <opendmb@gmail.com>
-M:     Florian Fainelli <florian.fainelli@broadcom>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
@@ -5181,6 +5183,7 @@ L:        linux-cxl@vger.kernel.org
 S:     Maintained
 F:     drivers/cxl/
 F:     include/uapi/linux/cxl_mem.h
+F:     tools/testing/cxl/
 
 COMPUTE EXPRESS LINK PMU (CPMU)
 M:     Jonathan Cameron <jonathan.cameron@huawei.com>
@@ -6647,6 +6650,7 @@ F:        drivers/gpu/drm/panel/panel-novatek-nt36672a.c
 DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 M:     Karol Herbst <kherbst@redhat.com>
 M:     Lyude Paul <lyude@redhat.com>
+M:     Danilo Krummrich <dakr@redhat.com>
 L:     dri-devel@lists.freedesktop.org
 L:     nouveau@lists.freedesktop.org
 S:     Supported