linux-kernel - linux-next: manual merge of the at91 tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20211022085641.57d666a4@canb.auug.org.au>
Date:   Fri, 22 Oct 2021 08:56:41 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Nicolas Ferre <nicolas.ferre@...el.com>,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Ludovic Desroches <ludovic.desroches@...rochip.com>
Cc:     Claudiu Beznea <claudiu.beznea@...rochip.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Nicolas Ferre <nicolas.ferre@...rochip.com>
Subject: linux-next: manual merge of the at91 tree with Linus' tree

Hi all,

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

  arch/arm/boot/dts/sama7g5.dtsi

between commit:

  6f3466228451 ("ARM: dts: at91: sama7g5: add chipid")

from Linus' tree and commit:

  9430ff34385e ("ARM: dts: at91: sama7g5: add tcb nodes")

from the at91 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/sama7g5.dtsi
index f98977f3980d,c75c7d7c2842..000000000000
--- a/arch/arm/boot/dts/sama7g5.dtsi
+++ b/arch/arm/boot/dts/sama7g5.dtsi
@@@ -159,11 -144,16 +166,21 @@@
  			clocks = <&clk32k 0>;
  		};
  
 +		chipid@...20000 {
 +			compatible = "microchip,sama7g5-chipid";
 +			reg = <0xe0020000 0x8>;
 +		};
 +
+ 		tcb1: timer@...00000 {
+ 			compatible = "atmel,sama5d2-tcb", "simple-mfd", "syscon";
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			reg = <0xe0800000 0x100>;
+ 			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&pmc PMC_TYPE_PERIPHERAL 91>, <&pmc PMC_TYPE_PERIPHERAL 92>, <&pmc PMC_TYPE_PERIPHERAL 93>, <&clk32k 1>;
+ 			clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
+ 		};
+ 
  		adc: adc@...00000 {
  			compatible = "microchip,sama7g5-adc";
  			reg = <0xe1000000 0x200>;

Content of type "application/pgp-signature" skipped