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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250605104826.3263d45b@canb.auug.org.au>
Date: Thu, 5 Jun 2025 10:48:26 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Rob Clark <robdclark@...il.com>, Sean Paul <seanpaul@...omium.org>
Cc: Abhinav Kumar <quic_abhinavk@...cinc.com>, Bryan O'Donoghue
 <bod@...nel.org>, Bryan O'Donoghue <bryan.odonoghue@...aro.org>, Hans
 Verkuil <hverkuil@...all.nl>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Rob Clark <robin.clark@....qualcomm.com>
Subject: linux-next: manual merge of the drm-msm tree with Linus' tree

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 <quic_vgarodia@...cinc.com>
  M:	Dikshita Agarwal <quic_dikshita@...cinc.com>
- R:	Abhinav Kumar <quic_abhinavk@...cinc.com>
+ R:	Abhinav Kumar <abhinav.kumar@...ux.dev>
 +R:	Bryan O'Donoghue <bryan.odonoghue@...aro.org>
  L:	linux-media@...r.kernel.org
  L:	linux-arm-msm@...r.kernel.org
  S:	Maintained

Content of type "application/pgp-signature" skipped