lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:   Fri, 1 Mar 2019 10:58:42 +0000
From:   Catalin Marinas <catalin.marinas@....com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Will Deacon <will.deacon@....com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Anders Roxell <anders.roxell@...aro.org>,
        Lucas Stach <l.stach@...gutronix.de>,
        Shawn Guo <shawnguo@...nel.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm64 tree

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

Powered by blists - more mailing lists