linux-kernel - linux-next: manual merge of the arm-soc tree with the staging 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120516185812.ce1ab57c3ec72445135a35fc@canb.auug.org.au>
Date:	Wed, 16 May 2012 18:58:12 +1000
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,
	Maxime Ripard <maxime.ripard@...e-electrons.com>,
	Greg KH <greg@...ah.com>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
Subject: linux-next: manual merge of the arm-soc tree with the staging tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/at91sam9g20.dtsi between commit 7cb2e629a240 ("ARM:
AT91: Add ADC driver to the at91sam9g20 dtsi") from the staging tree and
commit 5b6089cb6f28 ("ARM: at91: add at91sam9260 DT support") from the
arm-soc tree.

So, I didn't know what to do with this, so I used the arm-soc version of
this file (effectively throwing away the staging tree change).  Hints,
anyone?
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped