-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi Linus,
Please pull powerpc updates/fixes for 5.13. 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. This does contain a back merge of master, which I know you generally dislike, but doing that allowed me to get the list of selects under config PPC sorted alphabetically again. Paolo has picked up the KVM fix, but I wasn't sure he'd send it before rc1, so I picked it up as well. As of now there's no conflict between our trees, git works it out. cheers The following changes since commit 17ae69aba89dbfa2139b7f8024b757ab3cc42f59: Merge tag 'landlock_v34' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (2021-05-01 18:50:44 -0700 are available in the git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-5.13-2 for you to fetch changes up to f96271cefe6dfd1cb04195b76f4a33e185cd7f92: Merge branch 'master' into next (2021-05-08 21:12:55 +1000) - ------------------------------------------------------------------ powerpc fixes for 5.13 #2 - 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, Sourabh Jain. - ------------------------------------------------------------------ Christoph Hellwig (1): powerpc/powernv: remove the nvlink support Christophe Leroy (2): powerpc/32: Fix boot failure with CONFIG_STACKPROTECTOR powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC Michael Ellerman (1): Merge branch 'master' into next Nicholas Piggin (2): powerpc/64s/radix: Enable huge vmalloc mappings KVM: PPC: Book3S HV: Fix conversion to gfn-based MMU notifier callbacks Sandipan Das (1): powerpc/powernv/memtrace: Fix dcache flushing Sourabh Jain (1): powerpc/kexec_file: Use current CPU info while setting up FDT Documentation/admin-guide/kernel-parameters.txt | 2 + arch/powerpc/Kconfig | 37 +- arch/powerpc/include/asm/kvm_book3s.h | 2 +- arch/powerpc/include/asm/opal.h | 3 - arch/powerpc/include/asm/pci-bridge.h | 1 - arch/powerpc/include/asm/pci.h | 7 - arch/powerpc/kernel/module.c | 18 +- arch/powerpc/kexec/file_load_64.c | 92 +++ arch/powerpc/kvm/book3s_64_mmu_hv.c | 46 +- arch/powerpc/kvm/book3s_64_mmu_radix.c | 5 +- arch/powerpc/lib/Makefile | 3 + arch/powerpc/platforms/powernv/Makefile | 2 +- arch/powerpc/platforms/powernv/memtrace.c | 4 +- arch/powerpc/platforms/powernv/npu-dma.c | 705 -------------------- arch/powerpc/platforms/powernv/opal-call.c | 2 - arch/powerpc/platforms/powernv/pci-ioda.c | 185 +---- arch/powerpc/platforms/powernv/pci.c | 11 - arch/powerpc/platforms/powernv/pci.h | 17 +- arch/powerpc/platforms/pseries/pci.c | 23 - 19 files changed, 175 insertions(+), 990 deletions(-) delete mode 100644 arch/powerpc/platforms/powernv/npu-dma.c -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJFGtCPCthwEv2Y/bUevqPMjhpYAFAmCWlpMACgkQUevqPMjh pYAgChAAtssjqrHOYHHlc2QZ5qSczf2sE/Clq/p+HlZX6b5E5NACDjd5p6jU2GIK krVZXK4sQaikXV/KeODujbSuGHa6js5LgHVQWCuCCIrwp+Bdb/we7O0Mvj4pM7RS bXe1AK0xeTy2rg35cIXf9CfIUM+p5e+rm8vNPaSWza8npFZKsXaoQZAInxOx0MTa rEFJDi2YCvgQV2L5eFGlcL8EOExJbB9b8Xk3DYwu/t0CnvusW6044VRxGutnGBwY 6+QQ8bt/bYzRdgPGp8D9sZ5ivnDRZymoO138s3aSD0/786nysL+F4dRlYGzrr02M q5aYo7PCUctZJs/DivlBm2n0ttUs7Wp6XSNpVs5j/H28RjCq52u4VOsjyXMuzrqx KwAzJNzCfvA/BVOwJqlriaAij8sT5kcvtpZAP3tYDrcY8ZivleZ4SCibBoIChHnc jwRsv2wUfm3KmSfwy24tRWMQBeysm/OhbJTvC1Qc5bDO5v1r2qPnj2OAyuhWjHXw NmNfuHv1zVoOJ+OOjnnoc3EoPYANMxeSFkQWtFUvx6HUFJlBMhaldjC3YMAHV5ZI qkLFCDHKwnfJhnvnr0b0267XxAxXj5hjU+8T6rgnVNOyDKNuV0IGpMWaD3c4BkSO LrXiPhMSGBWdHHQ4kE1UG5TfCVOHzGGO6l4EI/APxUshqUJ3N20= =VXJA -----END PGP SIGNATURE-----
