From: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxxx>
Commit d968e50b5c26 ("media: rkvdec: Unstage the driver") moves the driver
from staging/media/ to media/platform/rockchip/ and adds a new section
ROCKCHIP RKVDEC VIDEO DECODER DRIVER in MAINTAINERS. It seems that it was
overlooked that the section ROCKCHIP VIDEO DECODER DRIVER in MAINTAINERS
already existed, referring to the same files before the driver was moved
as the new section refers to after the driver was moved.
So, merge the information from the two sections for ROCKCHIP (RKVDEC) VIDEO
DECODER DRIVER into one. This essentially results in adding the maintainer
of the previously existing section in the new section and then removing
that previously existing section.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxxx>
---
MAINTAINERS | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 5efcdb5537f5..d044e4f71ae5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21673,6 +21673,7 @@ F: drivers/media/platform/rockchip/rga/
ROCKCHIP RKVDEC VIDEO DECODER DRIVER
M: Detlev Casanova <detlev.casanova@xxxxxxxxxxxxx>
+M: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxxxxxxxxx>
L: linux-media@xxxxxxxxxxxxxxx
L: linux-rockchip@xxxxxxxxxxxxxxxxxxx
S: Maintained
@@ -21693,14 +21694,6 @@ S: Maintained
F: Documentation/devicetree/bindings/sound/rockchip,rk3576-sai.yaml
F: sound/soc/rockchip/rockchip_sai.*
-ROCKCHIP VIDEO DECODER DRIVER
-M: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxxxxxxxxx>
-L: linux-media@xxxxxxxxxxxxxxx
-L: linux-rockchip@xxxxxxxxxxxxxxxxxxx
-S: Maintained
-F: Documentation/devicetree/bindings/media/rockchip,vdec.yaml
-F: drivers/staging/media/rkvdec/
-
ROCKER DRIVER
M: Jiri Pirko <jiri@xxxxxxxxxxx>
L: netdev@xxxxxxxxxxxxxxx
--
2.50.0
