From: Michael Ellerman <mpe@ellerman.id.au>
To: Christophe Leroy <christophe.leroy@csgroup.eu>,
Stephen Rothwell <sfr@canb.auug.org.au>,
PowerPC <linuxppc-dev@lists.ozlabs.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the powerpc tree with the mm-stable tree
Date: Mon, 18 Mar 2024 22:52:12 +1100 [thread overview]
Message-ID: <87o7bbzrir.fsf@mail.lhotse> (raw)
In-Reply-To: <61110d70-7b18-40a2-b3d2-6c267ab18096@csgroup.eu>
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
next prev parent reply other threads:[~2024-03-18 11:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 23:17 linux-next: manual merge of the powerpc tree with the mm-stable tree Stephen Rothwell
2024-02-29 6:37 ` Michael Ellerman
2024-03-15 7:33 ` Christophe Leroy
2024-03-18 11:52 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-22 0:16 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o7bbzrir.fsf@mail.lhotse \
--to=mpe@ellerman.id.au \
--cc=akpm@linux-foundation.org \
--cc=christophe.leroy@csgroup.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).