Commit 61a4b7d7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-fixes-2025-06-04' of https://gitlab.freedesktop.org/drm/msm into drm-next 



Just some mailmap/MAINTAINER email address updates

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://lore.kernel.org/r/CAF6AEGuW1kpUijxzLCc4TKph72-PfXvHTttNu214_1GB-R8qwg@mail.gmail.com
parents 1c1df79c ee11d953

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ Adam Radford <aradford@gmail.com> 
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>

Adrian Bunk <bunk@stusta.de>

Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>

Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>

Akhil P Oommen <akhilpo@oss.qualcomm.com> <akhilpo@codeaurora.org>

Akhil P Oommen <akhilpo@oss.qualcomm.com> <quic_akhilpo@quicinc.com>

Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@ -625,6 +626,8 @@ Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com> 
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@chromium.org>

Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@gmail.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>

Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>

MAINTAINERS

+6 −5
Original line number Diff line number Diff line
@@ -7514,7 +7514,7 @@ F: Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml 
F:	drivers/gpu/drm/tiny/panel-mipi-dbi.c









DRM DRIVER for Qualcomm Adreno GPUs









M:	Rob Clark <robdclark@gmail.com>









M:	Rob Clark <robin.clark@oss.qualcomm.com>









R:	Sean Paul <sean@poorly.run>









R:	Konrad Dybcio <konradybcio@kernel.org>









L:	linux-arm-msm@vger.kernel.org








@@ -7533,9 +7533,10 @@ F:	drivers/gpu/drm/msm/registers/adreno/







F:	include/uapi/drm/msm_drm.h

















DRM DRIVER for Qualcomm display hardware









M:	Rob Clark <robdclark@gmail.com>









M:	Abhinav Kumar <quic_abhinavk@quicinc.com>









M:	Rob Clark <robin.clark@oss.qualcomm.com>









M:	Dmitry Baryshkov <lumag@kernel.org>









R:	Abhinav Kumar <abhinav.kumar@linux.dev>









R:	Jessica Zhang <jessica.zhang@oss.qualcomm.com>









R:	Sean Paul <sean@poorly.run>









R:	Marijn Suijten <marijn.suijten@somainline.org>









L:	linux-arm-msm@vger.kernel.org








@@ -20036,7 +20037,7 @@ F:	drivers/soc/qcom/icc-bwmon.c







F:	drivers/soc/qcom/trace_icc-bwmon.h

















QUALCOMM IOMMU









M:	Rob Clark <robdclark@gmail.com>









M:	Rob Clark <robin.clark@oss.qualcomm.com>









L:	iommu@lists.linux.dev









L:	linux-arm-msm@vger.kernel.org









S:	Maintained








@@ -20079,7 +20080,7 @@ F:	drivers/regulator/vqmmc-ipq4019-regulator.c







QUALCOMM IRIS VIDEO ACCELERATOR DRIVER









M:	Vikash Garodia <quic_vgarodia@quicinc.com>









M:	Dikshita Agarwal <quic_dikshita@quicinc.com>









R:	Abhinav Kumar <quic_abhinavk@quicinc.com>









R:	Abhinav Kumar <abhinav.kumar@linux.dev>









L:	linux-media@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained