linux-kernel - linux-next: manual merge of the arm-soc tree with the xilinx 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: <20130405153335.baf29606a97b1bee415f3546@canb.auug.org.au>
Date:	Fri, 5 Apr 2013 15:33:35 +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,
	Rob Herring <rob.herring@...xeda.com>,
	John Linn <John.Linn@...inx.com>,
	Michal Simek <michal.simek@...inx.com>
Subject: linux-next: manual merge of the arm-soc tree with the xilinx tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-spear/spear13xx.c between commit c79e33b3e828 ("ARM:
smp_twd: convert to use CLKSRC_OF init") from the xilinx tree and commit
2b9c613c4ee1 ("ARM: spear: move generic.h and pl080.h into private dir")
from the arm-soc tree.

I fixed it up (just used the arm-soc tree version) and can carry the fix
as necessary (no action is required).

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

Content of type "application/pgp-signature" skipped