Subject: linux-next: manual merge of the drm-msm tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 5 Jun 2025 10:48:26 +1000

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  MAINTAINERS

between commit:

  4acbaa8794b3 ("media: MAINTAINERS: Add myself to iris Reviewers")

from Linus' tree and commit:

  d6984d0c0a56 ("MAINTAINERS: update my email address")

from the drm-msm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 95747d11d82a,afbb82858934..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -20429,8 -19975,7 +20430,8 @@@ F:	drivers/regulator/vqmmc-ipq4019-regu
  QUALCOMM IRIS VIDEO ACCELERATOR DRIVER
  M:	Vikash Garodia <[email-masked]>
  M:	Dikshita Agarwal <[email-masked]>
- R:	Abhinav Kumar <[email-masked]>
+ R:	Abhinav Kumar <[email-masked]>
 +R:	Bryan O'Donoghue <[email-masked]>
  L:	[email-masked]
  L:	[email-masked]
  S:	Maintained