MAINTAINERS: Update Vikash Garodia's email address

Replace my quicinc.com address with oss.qualcomm.com email in the
MAINTAINERS file for both IRIS and VENUS video accelerator drivers.
Also update mailmap to ensure proper attribution across historical
commits.

Signed-off-by: Vikash Garodia <quic_vgarodia@quicinc.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/.mailmap b/.mailmap
index 81c59b47b848cc21e141277159d4dd7e2e752211..1f63302097efcc63e5de64af9550fa8f1ff6f1d5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -813,7 +813,8 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
 Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
 Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
 Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
-Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
+Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
+Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
 Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
 Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
 Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 27c681421e1114370d3570c5f299b7380fab90eb..ee8cb2db483f6a5e96b62b6f2edd05b1427b69f5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20840,7 +20840,7 @@ F:      Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
 F:     drivers/regulator/vqmmc-ipq4019-regulator.c
 
 QUALCOMM IRIS VIDEO ACCELERATOR DRIVER
-M:     Vikash Garodia <quic_vgarodia@quicinc.com>
+M:     Vikash Garodia <vikash.garodia@oss.qualcomm.com>
 M:     Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
 R:     Abhinav Kumar <abhinav.kumar@linux.dev>
 L:     linux-media@vger.kernel.org
@@ -20922,7 +20922,7 @@ F:      Documentation/devicetree/bindings/usb/qcom,pmic-*.yaml
 F:     drivers/usb/typec/tcpm/qcom/
 
 QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
-M:     Vikash Garodia <quic_vgarodia@quicinc.com>
+M:     Vikash Garodia <vikash.garodia@oss.qualcomm.com>
 M:     Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
 L:     linux-media@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org