From: Vladimir Oltean <[email protected]>

The ocelot switchdev driver also provides a set of library functions for
the felix DSA driver, which in practice means that most of the patches
will be of interest to both groups of driver maintainers.

So, as also suggested in the discussion here, let's merge the 2 entries
into a single larger one:
https://www.spinics.net/lists/netdev/msg657412.html

Note that the entry has been renamed into "OCELOT SWITCH" since neither
Vitesse nor Microsemi exist any longer as company names, instead they
are now named Microchip (which again might be subject to change in the
future), so use the device family name instead.

Suggested-by: Alexandre Belloni <[email protected]>
Signed-off-by: Vladimir Oltean <[email protected]>
---
 MAINTAINERS | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index f08f290df174..621474172fdf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11339,14 +11339,6 @@ L:     [email protected]
 S:     Supported
 F:     drivers/dma/at_xdmac.c
 
-MICROSEMI ETHERNET SWITCH DRIVER
-M:     Alexandre Belloni <[email protected]>
-M:     Microchip Linux Driver Support <[email protected]>
-L:     [email protected]
-S:     Supported
-F:     drivers/net/ethernet/mscc/
-F:     include/soc/mscc/ocelot*
-
 MICROSEMI MIPS SOCS
 M:     Alexandre Belloni <[email protected]>
 M:     Microchip Linux Driver Support <[email protected]>
@@ -12305,6 +12297,18 @@ M:     Peter Zijlstra <[email protected]>
 S:     Supported
 F:     tools/objtool/
 
+OCELOT ETHERNET SWITCH DRIVER
+M:     Microchip Linux Driver Support <[email protected]>
+M:     Vladimir Oltean <[email protected]>
+M:     Claudiu Manoil <[email protected]>
+M:     Alexandre Belloni <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     include/soc/mscc/ocelot*
+F:     drivers/net/ethernet/mscc/
+F:     drivers/net/dsa/ocelot/*
+F:     net/dsa/tag_ocelot.c
+
 OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
 M:     Frederic Barrat <[email protected]>
 M:     Andrew Donnellan <[email protected]>
@@ -18188,14 +18192,6 @@ S:     Maintained
 F:     drivers/input/serio/userio.c
 F:     include/uapi/linux/userio.h
 
-VITESSE FELIX ETHERNET SWITCH DRIVER
-M:     Vladimir Oltean <[email protected]>
-M:     Claudiu Manoil <[email protected]>
-L:     [email protected]
-S:     Maintained
-F:     drivers/net/dsa/ocelot/*
-F:     net/dsa/tag_ocelot.c
-
 VIVID VIRTUAL VIDEO DRIVER
 M:     Hans Verkuil <[email protected]>
 L:     [email protected]
-- 
2.25.1

Reply via email to