linux-kernel - linux-next: manual merge of the davinci tree with the arm 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: <20100129111342.203358d9.sfr@canb.auug.org.au>
Date:	Fri, 29 Jan 2010 11:13:42 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kevin Hilman <khilman@...prootsystems.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the davinci tree with the arm tree

Hi Kevin,

Today's linux-next merge of the davinci tree got a conflict in
arch/arm/mach-bcmring/core.c between commit
dd84ce18c8f522d26aef6e9e9c05c32485b667a7 ("ARM: Consolidate
clks_register() and similar") from the arm tree and commit
25c692215f5dfc4992b11c4fb57538d1139d6636 ("Consolidate clks_register()
and similar") from the davinci tree.

The davinci tree version has a typo (ARRAY_SIEZ v. ARRAY_SIZE) so I used
the arm tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped