Skip to contentSkip to conversation

MAINTAINERS: Merge the two e500 sections

PATCH Applied Thomas Huth 3 participants 3 messages Jan 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MAINTAINERS: Merge the two e500 sections

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.

---
 MAINTAINERS | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
MAINTAINERS +3 -10
index eac36b6..30dbe37 100644
@@ -957,9 +957,10 @@ e500
 M: David Gibson <[email protected]>
 L: [email protected]
 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
@@ -1316,14 +1317,6 @@ F: hw/i2c/ppc4xx_i2c.c
 F: include/hw/ppc/ppc4xx.h
 F: include/hw/i2c/ppc4xx_i2c.h
 
-ppce500
-M: David Gibson <[email protected]>
-L: [email protected]
-S: Odd Fixes
-F: hw/ppc/e500*
-F: hw/pci-host/ppce500.c
-F: hw/net/fsl_etsec/
-
 Character devices
 M: Marc-André Lureau <[email protected]>
 R: Paolo Bonzini <[email protected]>
Signature · 1 line
1.8.3.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Thomas Huth

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.

Quoted 37 lines
---
 MAINTAINERS | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
MAINTAINERS +3 -10
index eac36b6..30dbe37 100644
@@ -957,9 +957,10 @@ e500
 M: David Gibson <[email protected]>
 L: [email protected]
 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
@@ -1316,14 +1317,6 @@ F: hw/i2c/ppc4xx_i2c.c
 F: include/hw/ppc/ppc4xx.h
 F: include/hw/i2c/ppc4xx_i2c.h
 
-ppce500
-M: David Gibson <[email protected]>
-L: [email protected]
-S: Odd Fixes
-F: hw/ppc/e500*
-F: hw/pci-host/ppce500.c
-F: hw/net/fsl_etsec/
-
 Character devices
 M: Marc-André Lureau <[email protected]>
 R: Paolo Bonzini <[email protected]>
Applied
#2 lore raw
In reply to Thomas Huth
Quoted 9 lines · Thomas Huth

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.

Applied to ppc-for-4.0, thanks.

Quoted 36 lines
---
 MAINTAINERS | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
MAINTAINERS +3 -10
index eac36b6..30dbe37 100644
@@ -957,9 +957,10 @@ e500
 M: David Gibson <[email protected]>
 L: [email protected]
 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
@@ -1316,14 +1317,6 @@ F: hw/i2c/ppc4xx_i2c.c
 F: include/hw/ppc/ppc4xx.h
 F: include/hw/i2c/ppc4xx_i2c.h
 
-ppce500
-M: David Gibson <[email protected]>
-L: [email protected]
-S: Odd Fixes
-F: hw/ppc/e500*
-F: hw/pci-host/ppce500.c
-F: hw/net/fsl_etsec/
-
 Character devices
 M: Marc-André Lureau <[email protected]>
 R: Paolo Bonzini <[email protected]>
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson