linux-kernel - Re: linux-next: manual merge of the mm-unstable tree with the risc-v-fixes 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <mhng-B82EDBD2-2149-412D-961D-9B999FB009BC@palmerdabbelt-mac>
Date: Mon, 23 Jun 2025 17:10:31 -0700 (PDT)
From: Palmer Dabbelt <palmer@...belt.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: akpm@...ux-foundation.org, Paul Walmsley <paul.walmsley@...ive.com>,
  fustini@...nel.org, duje@...emihanovic.xyz, linux-kernel@...r.kernel.org,
  linux-next@...r.kernel.org
Subject:     Re: linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree

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@...b.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@...il.com> <
>>   Dmitry Safonov <0x7f454c46@...il.com> <dsafonov@...tuozzo.com>
>>   Domen Puncer <domen@...erock.org>
>>   Douglas Gilbert <dougg@...que.net>
>>  +Drew Fustini <fustini@...nel.org> <drew@...7.com>
>> + <duje@...emihanovic.xyz> <duje.mihanovic@...le.hr>
>>   Ed L. Cashin <ecashin@...aid.com>
>>   Elliot Berman <quic_eberman@...cinc.com> <eberman@...eaurora.org>
>>   Enric Balletbo i Serra <eballetbo@...nel.org> <enric.balletbo@...labora.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