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=-2.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT 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 A8242C43381 for ; Fri, 1 Mar 2019 10:58:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 77E9720663 for ; Fri, 1 Mar 2019 10:58:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="k9dhpsor" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77E9720663 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ujmWskw8bHGvEvGWji1InHnSsxIB+na3QhRwuuyzJ5Q=; b=k9dhpsorFcHcL1 suKMGKw6t66qqH0dE9K/qScvy401dxFHRUb/iAqg1ECXY+5yUECNmCyPuHGwlrAcQrYVCsTU/dM7A vnCiJa+iwQlOVCAmFTB89INE42tJPWMuMdUTugjHCCBItL5xTdErvTm7ShumwMOpHvmnFPUsaz6qi F53w9BZBQUbaEXneueFE82ooAHOEYyQCs+bexKyH4xsPwKNYKK+d+41rKE33FM7Kctzl1XLEsFZH+ vS31oWVAr55vvT+n7UReAvvYil4Q/cnhanXELGei1/RSRkoZuKeDWM2vgazHBm7j2ExD7Y5MXwVDa 7FKtrBNGcc06+vStYZWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gzfsQ-00064L-Lm; Fri, 01 Mar 2019 10:58:50 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gzfsN-00063q-Pk for linux-arm-kernel@lists.infradead.org; Fri, 01 Mar 2019 10:58:49 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1515AEBD; Fri, 1 Mar 2019 02:58:47 -0800 (PST) Received: from arrakis.emea.arm.com (arrakis.cambridge.arm.com [10.1.196.78]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 487723F575; Fri, 1 Mar 2019 02:58:45 -0800 (PST) Date: Fri, 1 Mar 2019 10:58:42 +0000 From: Catalin Marinas To: Stephen Rothwell Subject: Re: linux-next: manual merge of the arm-soc tree with the arm64 tree Message-ID: <20190301105842.GA10733@arrakis.emea.arm.com> References: <20190301091036.3e97bb49@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190301091036.3e97bb49@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190301_025847_835571_AAA63155 X-CRM114-Status: GOOD ( 14.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anders Roxell , Arnd Bergmann , Will Deacon , Linux Kernel Mailing List , Linux Next Mailing List , Olof Johansson , Shawn Guo , ARM , Lucas Stach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Mar 01, 2019 at 09:10:36AM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm64/Kconfig.platforms > > between commit: > > a29c78234942 ("arm64: Kconfig.platforms: fix warning unmet direct dependencies") > > from the arm64 tree and commits: > > 67b9282387c5 ("arm64: imx8mq: select GPCv2 irqchip driver") > 84a2ab25b12d ("arm64: imx8mq: select PM support") > > from the arm-soc tree. [...] > diff --cc arch/arm64/Kconfig.platforms > index d4faca775d9c,c5f6a57f16b8..000000000000 > --- a/arch/arm64/Kconfig.platforms > +++ b/arch/arm64/Kconfig.platforms > @@@ -145,7 -151,11 +151,11 @@@ config ARCH_MVEB > config ARCH_MXC > bool "ARMv8 based NXP i.MX SoC family" > select ARM64_ERRATUM_843419 > - select ARM64_ERRATUM_845719 > + select ARM64_ERRATUM_845719 if COMPAT > + select IMX_GPCV2 > + select IMX_GPCV2_PM_DOMAINS > + select PM > + select PM_GENERIC_DOMAINS > help > This enables support for the ARMv8 based SoCs in the > NXP i.MX family. The resolution looks fine, thanks Stephen. Olof, Arnd, I can drop this commit if you'd rather merge it via the arm-soc tree (it was related to a CPU erratum and thought I'd pick it up). -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel