From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
Will Deacon <will.deacon@arm.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Anders Roxell <anders.roxell@linaro.org>,
Lucas Stach <l.stach@pengutronix.de>,
Shawn Guo <shawnguo@kernel.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm64 tree
Date: Fri, 1 Mar 2019 10:58:42 +0000 [thread overview]
Message-ID: <20190301105842.GA10733@arrakis.emea.arm.com> (raw)
In-Reply-To: <20190301091036.3e97bb49@canb.auug.org.au>
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
next prev parent reply other threads:[~2019-03-01 10:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 22:10 linux-next: manual merge of the arm-soc tree with the arm64 tree Stephen Rothwell
2019-03-01 10:58 ` Catalin Marinas [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-05 3:32 Stephen Rothwell
2012-09-24 9:25 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190301105842.GA10733@arrakis.emea.arm.com \
--to=catalin.marinas@arm.com \
--cc=anders.roxell@linaro.org \
--cc=arnd@arndb.de \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=shawnguo@kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).