* linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree
@ 2025-06-23 0:14 Stephen Rothwell
2025-06-24 0:08 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2025-06-23 0:14 UTC (permalink / raw)
To: Andrew Morton, Palmer Dabbelt, Paul Walmsley
Cc: Drew Fustini, Duje Mihanović, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1342 bytes --]
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 <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>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree
2025-06-23 0:14 linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree Stephen Rothwell
@ 2025-06-24 0:08 ` Stephen Rothwell
2025-06-24 0:10 ` Palmer Dabbelt
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2025-06-24 0:08 UTC (permalink / raw)
To: Andrew Morton, Palmer Dabbelt, Paul Walmsley
Cc: Drew Fustini, Duje Mihanović, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree
2025-06-24 0:08 ` Stephen Rothwell
@ 2025-06-24 0:10 ` Palmer Dabbelt
2025-06-24 0:20 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Palmer Dabbelt @ 2025-06-24 0:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: akpm, Paul Walmsley, fustini, duje, linux-kernel, linux-next
On Mon, 23 Jun 2025 17:08:51 PDT (-0700), Stephen Rothwell wrote:
> 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.
Thanks. I think this one's just OK to call out as a trivial one when
stuff goes up to Linus. I'm planning on sending a PR later this week,
usually Friday mornings.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree
2025-06-24 0:10 ` Palmer Dabbelt
@ 2025-06-24 0:20 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-06-24 0:20 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: akpm, Paul Walmsley, fustini, duje, linux-kernel, linux-next
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
Hi Palmer,
On Mon, 23 Jun 2025 17:10:31 -0700 (PDT) Palmer Dabbelt <palmer@dabbelt•com> wrote:
>
> Thanks. I think this one's just OK to call out as a trivial one when
> stuff goes up to Linus.
Sounds fine.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-06-24 0:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-23 0:14 linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree Stephen Rothwell
2025-06-24 0:08 ` Stephen Rothwell
2025-06-24 0:10 ` Palmer Dabbelt
2025-06-24 0:20 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox