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-next>] [day] [month] [year] [list]
Date:   Fri, 1 Mar 2019 09:10:36 +1100
From:   Stephen Rothwell <>
To:     Olof Johansson <>, Arnd Bergmann <>,
        ARM <>,
        Catalin Marinas <>,
        Will Deacon <>
Cc:     Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Anders Roxell <>,
        Lucas Stach <>,
        Shawn Guo <>
Subject: linux-next: manual merge of the arm-soc tree with the arm64 tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in:


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.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Stephen Rothwell

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 PM
  	  This enables support for the ARMv8 based SoCs in the
  	  NXP i.MX family.

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists