From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCAD1C433ED for ; Sat, 8 May 2021 13:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9261260FEF for ; Sat, 8 May 2021 13:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbhEHNww (ORCPT ); Sat, 8 May 2021 09:52:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229494AbhEHNwv (ORCPT ); Sat, 8 May 2021 09:52:51 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE6D8C061574 for ; Sat, 8 May 2021 06:51:49 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4FcpdX6Zlgz9vFX; Sat, 8 May 2021 23:51:44 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1620481906; bh=YfiiOV9BifIml7tIdKSOd7vkBq6VgUlb/IpuGb/eJDI=; h=From:To:Cc:Subject:Date:From; b=T04lyP408rc0y2D0W5WZIiBW/qLS6Yr0raGnfae1LChEWGf1w43fCz6vdKT5HVsgf rOCTYhPwYVBS+svN8cVzphqJ3RpjYTMjqVQbxP4LBUgSLVIBmoSgodwKjoUUQbR0NR v1w3CN+hAkuPwrvqaR+RWUsmLb96E9oJC7RBnFg8lFE7UCVXxotSUzuZWqVpdWrOHt Bct3cU4CU0o/sGdy58h2Nhtz4iLgbG99h8Wmo/QXMRBZWwEmTbZb5FTzCb3/oBEltd r+Gb+1BkkfdYU9LMWtaBUSWkOMg2fiFZ1o7nunuRsvmX9OSz4Kg0qqBUEb3Gfsyt6R GCaHY35sget3Q== From: Michael Ellerman To: Linus Torvalds Cc: christophe.leroy@csgroup.eu, gregkh@linuxfoundation.org, hch@lst.de, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, npiggin@gmail.com, sandipan@linux.ibm.com, sourabhjain@linux.ibm.com, Paolo Bonzini Subject: [GIT PULL] Please pull powerpc/linux.git powerpc-5.13-2 tag Date: Sat, 08 May 2021 23:51:40 +1000 Message-ID: <87y2cpxrir.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org -----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-----