Re: [GIT PULL] Please pull powerpc/linux.git powerpc-4.12-1 tag

[Linus Torvalds]

On Fri, May 5, 2017 at 6:20 AM, Michael Ellerman <mpe@xxxxxxxxxxxxxx> wrote:
>
> Also due to a screw-up on my part, we need a hunk added when you merge
> the powerpc tree with the KVM tree:
>
> diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
> index 7807ee17af4b..ffe1da95033a 100644
> --- a/arch/powerpc/kvm/book3s_xive.c
> +++ b/arch/powerpc/kvm/book3s_xive.c
> @@ -24,6 +24,7 @@
>  #include <asm/xive.h>
>  #include <asm/xive-regs.h>
>  #include <asm/debug.h>
> +#include <asm/debugfs.h>
>  #include <asm/time.h>
>  #include <asm/opal.h>
>
> I haven't seen a pull request from Paolo yet, so possibly you'll need
> to add that later when you merge the KVM tree.

Ok. I won't catch this in my allmodconfig build due to the
ppc-specific nature of it, so I'll probably forget about this and not
catch it.

Paolo, Radim, can you try to remind me about this conflict when you
send the KVM pull request?

Also:

>   - Larger virtual address space on 64-bit server CPUs. By default we
>     use a 128TB virtual address space, but a process can request access
>     to the full 512TB by passing a hint to mmap().

I'm assuming/hoping this uses the same logic as the upcoming 47+ bit
5-level page table x86 support? Sounds like it, but I didn't check the
code.

See "x86/mm: Allow to have userspace mappings above 47-bits" which
hasn't been merged yet, but has been discussed on linux-mm, for
example.

Thanks,

                Linus