linux-kernel - linux-next: manual merge of the clockevents tree with the arm-soc tree

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 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Mon, 10 Apr 2017 13:18:51 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Lezcano <daniel.lezcano@...aro.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Heiko Stuebner <heiko@...ech.de>,
        Alexander Kochetkov <al.kochet@...il.com>
Subject: linux-next: manual merge of the clockevents tree with the arm-soc
 tree

Hi Daniel,

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

  arch/arm/boot/dts/rk3188.dtsi

between commit:

  2e1aa605fadd ("ARM: dts: rockchip: fix PPI misconfiguration on Cortex-A9 socs")

from the arm-soc tree and commit:

  500d0aa918a2 ("ARM: dts: rockchip: disable arm-global-timer for rk3188")

from the clockevents 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/boot/dts/rk3188.dtsi
index fa1bdb8875ae,1aff4ad22fc4..000000000000
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@@ -529,7 -545,8 +545,8 @@@
  };
  
  &global_timer {
 -	interrupts = <GIC_PPI 11 0xf04>;
 +	interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+ 	status = "disabled";
  };
  
  &local_timer {