linux-kernel - linux-next: manual merge of the arm 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20100713105130.3c927926.sfr@canb.auug.org.au>
Date:	Tue, 13 Jul 2010 10:51:30 +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,
	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
Subject: linux-next: manual merge of the arm tree with Linus' tree

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/configs/lusl7200_defconfig between commit
07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
Linus' tree and commit c9c6fe5033191d82e1d819105485c795062107fd ("ARM:
Remove support for LinkUp Systems L7200 SDP") from the arm tree.

The latter 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