diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-08 17:49:54 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-08 17:49:54 +0200 |
commit | ab159ac569fddf812c0a217d6dbffaa5d93ef88f (patch) | |
tree | 5926a202f4e3086ee86a7dcffe07c1963df475cb /arch/riscv/include/asm/pgtable-64.h | |
parent | Merge tag 'net-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
parent | Merge branch 'master' into next (diff) | |
download | linux-ab159ac569fddf812c0a217d6dbffaa5d93ef88f.tar.xz linux-ab159ac569fddf812c0a217d6dbffaa5d93ef88f.zip |
Merge tag 'powerpc-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc updates and fixes from Michael Ellerman:
"A bit of a mixture of things, tying up some loose ends.
There's the removal of the nvlink code, which dependend on a commit in
the vfio tree. Then the enablement of huge vmalloc which was in next
for a few weeks but got dropped due to conflicts. And there's also a
few fixes.
Summary:
- Remove the nvlink support now that it's only user has been removed.
- Enable huge vmalloc mappings for Radix MMU (P9).
- Fix KVM conversion to gfn-based MMU notifier callbacks.
- Fix a kexec/kdump crash with hot plugged CPUs.
- Fix boot failure on 32-bit with CONFIG_STACKPROTECTOR.
- Restore alphabetic order of the selects under CONFIG_PPC.
Thanks to: Christophe Leroy, Christoph Hellwig, Nicholas Piggin,
Sandipan Das, and Sourabh Jain"
* tag 'powerpc-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
KVM: PPC: Book3S HV: Fix conversion to gfn-based MMU notifier callbacks
powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC
powerpc/32: Fix boot failure with CONFIG_STACKPROTECTOR
powerpc/powernv/memtrace: Fix dcache flushing
powerpc/kexec_file: Use current CPU info while setting up FDT
powerpc/64s/radix: Enable huge vmalloc mappings
powerpc/powernv: remove the nvlink support
Diffstat (limited to 'arch/riscv/include/asm/pgtable-64.h')
0 files changed, 0 insertions, 0 deletions