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=-8.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 89C43C433DF for ; Sat, 17 Oct 2020 10:14:20 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 72FF520714 for ; Sat, 17 Oct 2020 10:14:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="r85jUpGp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72FF520714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CCzQJ5Gt0zDqwP for ; Sat, 17 Oct 2020 21:14:16 +1100 (AEDT) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CCzNR2flPzDqlK for ; Sat, 17 Oct 2020 21:12:39 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=r85jUpGp; dkim-atps=neutral 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 4CCzND41jbz9sTc; Sat, 17 Oct 2020 21:12:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1602929558; bh=jx4jSwXojnGEjdS06THopQmjsKwy9vnpGRU1Yg/+LR0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=r85jUpGpfzFa3HUnz79ZDtfjkwJ+DwrPKFjCJGv9/w2mu4qGoFqeRNc2QGTYltSaG E4jx2/IodEThTcc4AvWpxhLTRA51ehQgsZuAveOK2ebZ3fUJH7Tn2zj+BqK+o63K1R QjHAECCtGh1c2uQhTeCNJN69rZQ4lzphWdJMggnIOLI7cNjPSzGPVTKXnFBz/RW7Se R7BJTPTIWKlkGMDRB1poeBZpYlpxlaZLVIGnC1gGPorAtKTEizH4easat4dMS/jDou Yd+QQ1yJEzVtDhqbRqyz8/Xp0xoJ+vnvgZhp5HvuATyo9FSMWBQCYakWW0ApeEiLYf FIqZSFFueYFIw== From: Michael Ellerman To: Linus Torvalds Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.10-1 tag In-Reply-To: References: <87a6wmzwco.fsf@mpe.ellerman.id.au> Date: Sat, 17 Oct 2020 21:12:27 +1100 Message-ID: <874kmtyxdg.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ego@linux.vnet.ibm.com, Stephen Kitt , Srikar Dronamraju , Ravi Bangoria , Peter Zijlstra , jniethe5@gmail.com, mahesh@linux.ibm.com, liushixin2@huawei.com, Oliver O'Halloran , fthain@telegraphics.com.au, hofrat@osadl.org, Christoph Hellwig , leobras.c@gmail.com, "Aneesh Kumar K.V" , wangwensheng4@huawei.com, Joel Stanley , yangyingliang@huawei.com, "Naveen N. Rao" , mrochs@linux.ibm.com, zhengbin , nathanl@linux.ibm.com, biwen.li@nxp.com, ajd@linux.ibm.com, Stephen Rothwell , kjain@linux.ibm.com, Nick Piggin , Qian Cai , clg@kaod.org, Vaibhav Jain , Daniel Axtens , atrajeev@linux.vnet.ibm.com, gromero@linux.ibm.com, cheloha@linux.ibm.com, yanaijie@huawei.com, Linux Kernel Mailing List , Li Yang , Wolfram Sang , miaoqinglang@huawei.com, fbarrat@linux.ibm.com, Colin King , linuxppc-dev , David Miller , bauerman@linux.ibm.com Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Linus Torvalds writes: > On Thu, Oct 15, 2020 at 8:24 PM Michael Ellerman wrote: >> >> Just two minor conflicts I'm aware of. The only slight subtlety is the conflict >> in kasan_init() where "int ret" needs to move out of the for_each_mem_range() >> and up to the function scope. > > Well, there was also a conflict for the dependencies of OCXL. Yep, it was so trivial I didn't think it was worth calling out. > I resolved that by ruthlessly simplifying the dependency: > > - depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV > - depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE > ++ depends on HOTPLUG_PCI_POWERNV > > because all the other dependencies seem to be pointless. > > HOTPLUG_PCI_POWERNV already has a > > depends on PPC_POWERNV && EEH > > so there's no point in repeating those. And PPC_POWERNV selects FORCE_PCI, which takes care of the dependency on PCI. > And PPC_XIVE_NATIVE is selected by PPC_POWERNV, so if PPC_POWERNV, we > know PPC_XIVE_NATIVE is set. > > Maybe I missed something strange, so I'm just letting you know so you > can blame me if I broke something. No, that looks good to me. Thanks. cheers