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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 B6C15C433DF for ; Sat, 17 Oct 2020 10:12:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2930C20720 for ; Sat, 17 Oct 2020 10:12:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="r85jUpGp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437174AbgJQKMk (ORCPT ); Sat, 17 Oct 2020 06:12:40 -0400 Received: from ozlabs.org ([203.11.71.1]:55599 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2411749AbgJQKMk (ORCPT ); Sat, 17 Oct 2020 06:12:40 -0400 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 Cc: ajd@linux.ibm.com, "Aneesh Kumar K.V" , atrajeev@linux.vnet.ibm.com, bauerman@linux.ibm.com, biwen.li@nxp.com, Qian Cai , cheloha@linux.ibm.com, Christophe Leroy , clg@kaod.org, Colin King , David Miller , Daniel Axtens , ego@linux.vnet.ibm.com, fbarrat@linux.ibm.com, fthain@telegraphics.com.au, gromero@linux.ibm.com, Christoph Hellwig , hofrat@osadl.org, jniethe5@gmail.com, Joel Stanley , kjain@linux.ibm.com, leobras.c@gmail.com, Li Yang , Linux Kernel Mailing List , linuxppc-dev , liushixin2@huawei.com, mahesh@linux.ibm.com, miaoqinglang@huawei.com, mrochs@linux.ibm.com, nathanl@linux.ibm.com, "Naveen N. Rao" , Nick Piggin , Oliver O'Halloran , Paul Mackerras , Peter Zijlstra , Ravi Bangoria , Russell Currey , Stephen Rothwell , Srikar Dronamraju , Stephen Kitt , Vaibhav Jain , wangwensheng4@huawei.com, Wolfram Sang , yanaijie@huawei.com, yangyingliang@huawei.com, zhengbin 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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