linux-kernel - Re: linux-next: manual merge of the powerpc tree with the mm-stable 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: <61110d70-7b18-40a2-b3d2-6c267ab18096@csgroup.eu>
Date: Fri, 15 Mar 2024 07:33:25 +0000
From: Christophe Leroy <christophe.leroy@...roup.eu>
To: Michael Ellerman <mpe@...erman.id.au>, Stephen Rothwell
	<sfr@...b.auug.org.au>, PowerPC <linuxppc-dev@...ts.ozlabs.org>, Andrew
 Morton <akpm@...ux-foundation.org>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the powerpc tree with the mm-stable
 tree



Le 29/02/2024 à 07:37, Michael Ellerman a écrit :
> Stephen Rothwell <sfr@...b.auug.org.au> writes:
>> Hi all,
>>
>> Today's linux-next merge of the powerpc tree got a conflict in:
>>
>>    arch/powerpc/mm/pgtable_32.c
>>
>> between commit:
>>
>>    a5e8131a0329 ("arm64, powerpc, riscv, s390, x86: ptdump: refactor CONFIG_DEBUG_WX")
>>
>> from the mm-stable tree and commit:
>>
>>    8f17bd2f4196 ("powerpc: Handle error in mark_rodata_ro() and mark_initmem_nx()")
>>
>> from the powerpc tree.
> 
> Thanks. That's a fairly ugly conflict.
> 
> Maybe I'll drop that patch until the generic change has gone in.
> 

The change is now in linus tree.

Christophe