linux-kernel - linux-next: manual merge of the arm tree with the arm-current 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, 26 Jul 2010 11:13:40 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jeremy Kerr <jeremy.kerr@...onical.com>
Subject: linux-next: manual merge of the arm tree with the arm-current tree

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-l7200/include/mach/debug-macro.S between commit
a2d7c57a2eb1d30a7fdb8df9e965dea721b75711 ("ARM: 6257/1: arm/l7200: fix
debug macro compilation failure") from the arm-current tree and commit
c9c6fe5033191d82e1d819105485c795062107fd ("ARM: Remove support for LinkUp
Systems L7200 SDP") from the arm tree.

The latter just removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped