Merge branch 'pci/trivial'

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9bd4c3b154e85bc174acb79aa39b38dbdc4b0408..d88e268271d7956f50abef9d7417677517d7c646 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2091,7 +2091,6 @@ S:        Maintained
 
 ARM/QUALCOMM SUPPORT
 M:     Andy Gross <agross@kernel.org>
-M:     David Brown <david.brown@linaro.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/soc/qcom/
@@ -2113,7 +2112,7 @@ F:        drivers/i2c/busses/i2c-qup.c
 F:     drivers/i2c/busses/i2c-qcom-geni.c
 F:     drivers/mfd/ssbi.c
 F:     drivers/mmc/host/mmci_qcom*
-F:     drivers/mmc/host/sdhci_msm.c
+F:     drivers/mmc/host/sdhci-msm.c
 F:     drivers/pci/controller/dwc/pcie-qcom.c
 F:     drivers/phy/qualcomm/
 F:     drivers/power/*/msm*
@@ -6527,6 +6526,7 @@ M:        Li Yang <leoyang.li@nxp.com>
 L:     linuxppc-dev@lists.ozlabs.org
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt
 F:     Documentation/devicetree/bindings/soc/fsl/
 F:     drivers/soc/fsl/
 F:     include/linux/fsl/
@@ -8878,6 +8878,8 @@ F:        arch/s390/include/asm/gmap.h
 F:     arch/s390/include/asm/kvm*
 F:     arch/s390/kvm/
 F:     arch/s390/mm/gmap.c
+F:     tools/testing/selftests/kvm/s390x/
+F:     tools/testing/selftests/kvm/*/s390x/
 
 KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
 M:     Paolo Bonzini <pbonzini@redhat.com>
@@ -11907,11 +11909,13 @@ F:    include/linux/mtd/onenand*.h
 
 OP-TEE DRIVER
 M:     Jens Wiklander <jens.wiklander@linaro.org>
+L:     tee-dev@lists.linaro.org
 S:     Maintained
 F:     drivers/tee/optee/
 
 OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
 M:     Sumit Garg <sumit.garg@linaro.org>
+L:     tee-dev@lists.linaro.org
 S:     Maintained
 F:     drivers/char/hw_random/optee-rng.c
 
@@ -12129,7 +12133,8 @@ F:      Documentation/driver-api/parport*.rst
 
 PARAVIRT_OPS INTERFACE
 M:     Juergen Gross <jgross@suse.com>
-M:     Alok Kataria <akataria@vmware.com>
+M:     Thomas Hellstrom <thellstrom@vmware.com>
+M:     "VMware, Inc." <pv-drivers@vmware.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Supported
 F:     Documentation/virtual/paravirt_ops.txt
@@ -12437,16 +12442,18 @@ F:    arch/x86/kernel/early-quirks.c
 
 PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
 M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+R:     Andrew Murray <andrew.murray@arm.com>
 L:     linux-pci@vger.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-pci/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
 S:     Supported
 F:     drivers/pci/controller/
 
-PCIE DRIVER FOR ANNAPURNA LABS
+PCIE DRIVER FOR AMAZON ANNAPURNA LABS
 M:     Jonathan Chocron <jonnyc@amazon.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/pci/pcie-al.txt
 F:     drivers/pci/controller/dwc/pcie-al.c
 
 PCIE DRIVER FOR AMLOGIC MESON
@@ -13295,7 +13302,7 @@ M:      Niklas Cassel <niklas.cassel@linaro.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
-F:     Documentation/devicetree/bindings/net/qcom,dwmac.txt
+F:     Documentation/devicetree/bindings/net/qcom,ethqos.txt
 
 QUALCOMM GENERIC INTERFACE I2C DRIVER
 M:     Alok Chauhan <alokc@codeaurora.org>
@@ -15745,6 +15752,7 @@ F:      include/media/i2c/tw9910.h
 
 TEE SUBSYSTEM
 M:     Jens Wiklander <jens.wiklander@linaro.org>
+L:     tee-dev@lists.linaro.org
 S:     Maintained
 F:     include/linux/tee_drv.h
 F:     include/uapi/linux/tee.h
@@ -17174,7 +17182,8 @@ S:      Maintained
 F:     drivers/misc/vmw_balloon.c
 
 VMWARE HYPERVISOR INTERFACE
-M:     Alok Kataria <akataria@vmware.com>
+M:     Thomas Hellstrom <thellstrom@vmware.com>
+M:     "VMware, Inc." <pv-drivers@vmware.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Supported
 F:     arch/x86/kernel/cpu/vmware.c