[Qemu-devel] [PULL 22/37] MAINTAINERS: Merge the two e500 sections

[David Gibson]

From: Thomas Huth <address@hidden>

There is currently a "e500" machine section and a "ppce500" device
section in the maintainers file - with some oddities: The wildcard
in the device section also covers the files from the machine section.
And hw/pci-host/ppce500.c is in the device section, while its header
is in the machine section.
This is really quite confusing, and I don't see a reason why we really
need two sections here, so let's simply merge them.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
 MAINTAINERS | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d891e79faa..646e289df4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -960,9 +960,10 @@ e500
 M: David Gibson <address@hidden>
 L: address@hidden
 S: Odd Fixes
-F: hw/ppc/e500.[hc]
-F: hw/ppc/e500plat.c
+F: hw/ppc/e500*
 F: hw/gpio/mpc8xxx.c
+F: hw/net/fsl_etsec/
+F: hw/pci-host/ppce500.c
 F: include/hw/ppc/ppc_e500.h
 F: include/hw/pci-host/ppce500.h
 F: pc-bios/u-boot.e500
@@ -1319,14 +1320,6 @@ F: hw/i2c/ppc4xx_i2c.c
 F: include/hw/ppc/ppc4xx.h
 F: include/hw/i2c/ppc4xx_i2c.h
 
-ppce500
-M: David Gibson <address@hidden>
-L: address@hidden
-S: Odd Fixes
-F: hw/ppc/e500*
-F: hw/pci-host/ppce500.c
-F: hw/net/fsl_etsec/
-
 Character devices
 M: Marc-André Lureau <address@hidden>
 R: Paolo Bonzini <address@hidden>
-- 
2.20.1