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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1621 bytes --]

Hi all,

On Mon, 23 Jun 2025 10:14:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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 <0x7f454c46@gmail.com> <
>   Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
>   Domen Puncer <domen@coderock.org>
>   Douglas Gilbert <dougg@torque.net>
>  +Drew Fustini <fustini@kernel.org> <drew@pdp7.com>
> + <duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
>   Ed L. Cashin <ecashin@coraid.com>
>   Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
>   Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

This is now a conflict between the mm-hotifxes tree and the
risc-v-fixes tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]