From bffcb127dc4c0a33d363ea7f034a20dafbe22e17 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 15 Jul 2025 08:31:34 +0200 Subject: [PATCH] MAINTAINERS: merge sections for ROCKCHIP VIDEO DECODER DRIVER 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 Reviewed-by: Heiko Stuebner Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil --- MAINTAINERS | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 64ecfa45540c3..c57da16998995 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21813,6 +21813,7 @@ F: drivers/media/platform/rockchip/rga/ ROCKCHIP RKVDEC VIDEO DECODER DRIVER M: Detlev Casanova +M: Ezequiel Garcia L: linux-media@vger.kernel.org L: linux-rockchip@lists.infradead.org S: Maintained @@ -21833,14 +21834,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 -L: linux-media@vger.kernel.org -L: linux-rockchip@lists.infradead.org -S: Maintained -F: Documentation/devicetree/bindings/media/rockchip,vdec.yaml -F: drivers/staging/media/rkvdec/ - ROCKER DRIVER M: Jiri Pirko L: netdev@vger.kernel.org -- 2.47.3