Message ID | 20240229101721.58569685@canb.auug.org.au (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | linux-next: manual merge of the powerpc tree with the mm-stable tree | expand |
Stephen Rothwell <sfr@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. cheers
Le 29/02/2024 à 07:37, Michael Ellerman a écrit : > Stephen Rothwell <sfr@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. Christophe
Christophe Leroy <christophe.leroy@csgroup.eu> writes: > Le 29/02/2024 à 07:37, Michael Ellerman a écrit : >> Stephen Rothwell <sfr@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
diff --cc arch/powerpc/mm/pgtable_32.c index 12498017da8e,4be97b4a44f9..000000000000 --- a/arch/powerpc/mm/pgtable_32.c