It seems recent merges introduced a couple issues here, so let's fix them all. Also, reorder Rockchip video decoder as per parse-maintainers.pl script and add linux-rockchip mailing list. Reported-by: Johan Jonker <jbx6244@xxxxxxxxx> Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx> --- MAINTAINERS | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 09e0137df61d..4d5b06c6fe0f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7460,7 +7460,7 @@ L: linux-media@xxxxxxxxxxxxxxx L: linux-rockchip@xxxxxxxxxxxxxxxxxxx S: Maintained F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml -F: Documentation/devicetree/bindings/media/rockchip-vpu.txt +F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml F: drivers/staging/media/hantro/ HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER @@ -14465,13 +14465,6 @@ F: Documentation/ABI/*/sysfs-driver-hid-roccat* F: drivers/hid/hid-roccat* F: include/linux/hid-roccat* -ROCKCHIP VIDEO DECODER DRIVER -M: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx> -L: linux-media@xxxxxxxxxxxxxxx -S: Maintained -F: drivers/staging/media/rkvdec/ -F: Documentation/devicetree/bindings/media/rockchip,vdec.yaml - ROCKCHIP ISP V1 DRIVER M: Helen Koike <helen.koike@xxxxxxxxxxxxx> L: linux-media@xxxxxxxxxxxxxxx @@ -14483,12 +14476,19 @@ ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER M: Jacob Chen <jacob-chen@xxxxxxxxxx> M: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx> L: linux-media@xxxxxxxxxxxxxxx +L: linux-rockchip@xxxxxxxxxxxxxxxxxxx S: Maintained -F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml F: Documentation/devicetree/bindings/media/rockchip-rga.yaml -F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml F: drivers/media/platform/rockchip/rga/ +ROCKCHIP VIDEO DECODER DRIVER +M: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx> +L: linux-media@xxxxxxxxxxxxxxx +L: linux-rockchip@xxxxxxxxxxxxxxxxxxx +S: Maintained +F: drivers/staging/media/rkvdec/ +F: Documentation/devicetree/bindings/media/rockchip,vdec.yaml + ROCKER DRIVER M: Jiri Pirko <jiri@xxxxxxxxxxx> L: netdev@xxxxxxxxxxxxxxx -- 2.26.0.rc2