Christophe Leroy <christophe.le...@csgroup.eu> writes:
> Le 29/02/2024 à 07:37, Michael Ellerman a écrit :
>> Stephen Rothwell <s...@canb.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.
Thanks. I have moved my next up and applied your v2 on top of the
upstream changes.
cheers
