From: Michael Ellerman <mpe@ellerman.id.au>
To: Will Deacon <will.deacon@arm.com>
Cc: Christopher Covington <cov@codeaurora.org>,
criu@openvz.org, linux-mm@kvack.org,
Laurent Dufour <ldufour@linux.vnet.ibm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: Re: [RFC v2 5/7] powerpc: Rename context.vdso_base to context.vdso
Date: Mon, 07 Nov 2016 19:01:05 +1100 [thread overview]
Message-ID: <87a8dbn2gu.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <20161104201332.GB22791@arm.com>
Will Deacon <will.deacon@arm.com> writes:
> On Fri, Nov 04, 2016 at 03:58:22PM +1100, Michael Ellerman wrote:
>> Christopher Covington <cov@codeaurora.org> writes:
>> > arch/powerpc/include/asm/book3s/32/mmu-hash.h | 2 +-
>> > arch/powerpc/include/asm/book3s/64/mmu.h | 2 +-
>> > arch/powerpc/include/asm/mm-arch-hooks.h | 6 +++---
>> > arch/powerpc/include/asm/mmu-40x.h | 2 +-
>> > arch/powerpc/include/asm/mmu-44x.h | 2 +-
>> > arch/powerpc/include/asm/mmu-8xx.h | 2 +-
>> > arch/powerpc/include/asm/mmu-book3e.h | 2 +-
>> > arch/powerpc/include/asm/mmu_context.h | 4 ++--
>> > arch/powerpc/include/asm/vdso.h | 2 +-
>> > arch/powerpc/include/uapi/asm/elf.h | 2 +-
>> > arch/powerpc/kernel/signal_32.c | 8 ++++----
>> > arch/powerpc/kernel/signal_64.c | 4 ++--
>> > arch/powerpc/kernel/vdso.c | 8 ++++----
>> > arch/powerpc/perf/callchain.c | 12 ++++++------
>> > 14 files changed, 29 insertions(+), 29 deletions(-)
>>
>> This is kind of annoying, but I guess it's worth doing.
>>
>> It's going to conflict like hell though. Who were you thinking would
>> merge this series? I think it should go via Andrew Morton's tree, as
>> that way if we get bad conflicts we can pull it out and redo it.
>
> The other thing you can do is generate the patch towards the end of the
> merge window and send it as a separate pull request. The disadvantage of
> that is that it can't spend any time in -next, but that might be ok for a
> mechanical rename.
True. Though in this case it's a mechanical rename that then allows us
to use the generic code, so I'd prefer we had some -next coverage on the
latter.
The other other option would be to wrap all uses of the arch value in a
macro (or actually two probably, one a getter one a setter). That would
then allow arches to use the generic code regardless of the name and
type of their mm->context.vdso_whatever.
That would allow the basic series to go in, and then each arch could do
a series later that switches it to the "standard" name and type.
cheers
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-11-07 8:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-01 17:10 [RFC v2 1/7] mm: Provide generic VDSO unmap and remap functions Christopher Covington
2016-11-01 17:10 ` [RFC v2 2/7] arm: Use generic VDSO unmap and remap Christopher Covington
2016-11-01 17:18 ` Russell King - ARM Linux
2016-11-01 17:10 ` [RFC v2 3/7] arm64: Use unsigned long for VDSO Christopher Covington
2016-11-01 17:10 ` [RFC v2 4/7] arm64: Use generic VDSO unmap and remap functions Christopher Covington
2016-11-01 17:10 ` [RFC v2 5/7] powerpc: Rename context.vdso_base to context.vdso Christopher Covington
2016-11-04 4:58 ` Michael Ellerman
2016-11-04 20:13 ` Will Deacon
2016-11-07 8:01 ` Michael Ellerman [this message]
2016-11-01 17:11 ` [RFC v2 6/7] mm/powerpc: Use generic VDSO remap and unmap functions Christopher Covington
2016-11-04 4:59 ` Michael Ellerman
2016-11-07 20:20 ` Laurent Dufour
2016-11-07 23:51 ` Michael Ellerman
2016-11-01 17:11 ` [RFC v2 7/7] mm: Remove mm-arch-hooks.h Christopher Covington
2016-11-01 17:23 ` [RFC v2 1/7] mm: Provide generic VDSO unmap and remap functions Dmitry Safonov
2016-11-02 0:23 ` Christopher Covington
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=87a8dbn2gu.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=benh@kernel.crashing.org \
--cc=cov@codeaurora.org \
--cc=criu@openvz.org \
--cc=ldufour@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=will.deacon@arm.com \
/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