Subject: linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 23 Jun 2025 10:14:07 +1000

Hi all,

Today's linux-next merge of the mm-unstable tree got a conflict in:

  .mailmap

between commit:

  850f0e2433cd ("MAINTAINERS: Update Drew Fustini's email address")

from the risc-v-fixes tree and commit:

  a5d3f8d805d2 ("mailmap: update Duje Mihanović's email address")

from the mm-unstable 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 .mailmap
index 93e94b0b9376,60165a8144bd..000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -223,7 -222,7 +223,8 @@@ Dmitry Safonov <[email-masked]> <
  Dmitry Safonov <[email-masked]> <[email-masked]>
  Domen Puncer <[email-masked]>
  Douglas Gilbert <[email-masked]>
 +Drew Fustini <[email-masked]> <[email-masked]>
+ <[email-masked]> <[email-masked]>
  Ed L. Cashin <[email-masked]>
  Elliot Berman <[email-masked]> <[email-masked]>
  Enric Balletbo i Serra <[email-masked]> <[email-masked]>