linux-kernel - linux-next: manual merge of the arm-soc tree with the sound-asoc and pincrtl trees

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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121126205312.46fb3f816e1e95ba8cbb5049@canb.auug.org.au>
Date:	Mon, 26 Nov 2012 20:53:12 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Fabio Porcedda <fabio.porcedda@...il.com>,
	Nicolas Ferre <nicolas.ferre@...el.com>
Subject: linux-next: manual merge of the arm-soc tree with the sound-asoc
 and pincrtl trees

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/at91sam9263.dtsi between various commits from the
arm-soc and pinctrl trees and commit 7492e7ca0f95 ("ARM: at91/dts: add
at91sam9_wdt driver to at91sam926x, at91sam9g45") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/boot/dts/at91sam9263.dtsi
index 18d9310,ff54612..0000000
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@@ -403,23 -196,11 +403,29 @@@
  				status = "disabled";
  			};
  
 +			mmc0: mmc@...80000 {
 +				compatible = "atmel,hsmci";
 +				reg = <0xfff80000 0x600>;
 +				interrupts = <10 4 0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				status = "disabled";
 +			};
 +
 +			mmc1: mmc@...84000 {
 +				compatible = "atmel,hsmci";
 +				reg = <0xfff84000 0x600>;
 +				interrupts = <11 4 0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				status = "disabled";
 +			};
++
+ 			watchdog@...ffd40 {
+ 				compatible = "atmel,at91sam9260-wdt";
+ 				reg = <0xfffffd40 0x10>;
+ 				status = "disabled";
+ 			};
  		};
  
  		nand0: nand@...00000 {

Content of type "application/pgp-signature" skipped