Skip to content

Commit 61a4b7d

Browse files
committed
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: Dave Airlie <airlied@redhat.com> From: Rob Clark <robdclark@gmail.com> Link: https://lore.kernel.org/r/CAF6AEGuW1kpUijxzLCc4TKph72-PfXvHTttNu214_1GB-R8qwg@mail.gmail.com
2 parents 1c1df79 + ee11d95 commit 61a4b7d

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

.mailmap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Adam Radford <aradford@gmail.com>
2121
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
2222
Adrian Bunk <bunk@stusta.de>
2323
Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>
24-
Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
24+
Akhil P Oommen <akhilpo@oss.qualcomm.com> <akhilpo@codeaurora.org>
25+
Akhil P Oommen <akhilpo@oss.qualcomm.com> <quic_akhilpo@quicinc.com>
2526
Alan Cox <alan@lxorguk.ukuu.org.uk>
2627
Alan Cox <root@hraefn.swansea.linux.org.uk>
2728
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@ -625,6 +626,8 @@ Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com>
625626
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
626627
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
627628
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
629+
Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@chromium.org>
630+
Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@gmail.com>
628631
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
629632
Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
630633
Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>

MAINTAINERS

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7514,7 +7514,7 @@ F: Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
75147514
F: drivers/gpu/drm/tiny/panel-mipi-dbi.c
75157515

75167516
DRM DRIVER for Qualcomm Adreno GPUs
7517-
M: Rob Clark <robdclark@gmail.com>
7517+
M: Rob Clark <robin.clark@oss.qualcomm.com>
75187518
R: Sean Paul <sean@poorly.run>
75197519
R: Konrad Dybcio <konradybcio@kernel.org>
75207520
L: linux-arm-msm@vger.kernel.org
@@ -7533,9 +7533,10 @@ F: drivers/gpu/drm/msm/registers/adreno/
75337533
F: include/uapi/drm/msm_drm.h
75347534

75357535
DRM DRIVER for Qualcomm display hardware
7536-
M: Rob Clark <robdclark@gmail.com>
7537-
M: Abhinav Kumar <quic_abhinavk@quicinc.com>
7536+
M: Rob Clark <robin.clark@oss.qualcomm.com>
75387537
M: Dmitry Baryshkov <lumag@kernel.org>
7538+
R: Abhinav Kumar <abhinav.kumar@linux.dev>
7539+
R: Jessica Zhang <jessica.zhang@oss.qualcomm.com>
75397540
R: Sean Paul <sean@poorly.run>
75407541
R: Marijn Suijten <marijn.suijten@somainline.org>
75417542
L: linux-arm-msm@vger.kernel.org
@@ -20036,7 +20037,7 @@ F: drivers/soc/qcom/icc-bwmon.c
2003620037
F: drivers/soc/qcom/trace_icc-bwmon.h
2003720038

2003820039
QUALCOMM IOMMU
20039-
M: Rob Clark <robdclark@gmail.com>
20040+
M: Rob Clark <robin.clark@oss.qualcomm.com>
2004020041
L: iommu@lists.linux.dev
2004120042
L: linux-arm-msm@vger.kernel.org
2004220043
S: Maintained
@@ -20079,7 +20080,7 @@ F: drivers/regulator/vqmmc-ipq4019-regulator.c
2007920080
QUALCOMM IRIS VIDEO ACCELERATOR DRIVER
2008020081
M: Vikash Garodia <quic_vgarodia@quicinc.com>
2008120082
M: Dikshita Agarwal <quic_dikshita@quicinc.com>
20082-
R: Abhinav Kumar <quic_abhinavk@quicinc.com>
20083+
R: Abhinav Kumar <abhinav.kumar@linux.dev>
2008320084
L: linux-media@vger.kernel.org
2008420085
L: linux-arm-msm@vger.kernel.org
2008520086
S: Maintained

0 commit comments

Comments
 (0)