linux-kernel - Re: 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <87iqakpjue.fsf@deeprootsystems.com>
Date:	Fri, 29 Jan 2010 15:33:29 -0800
From:	Kevin Hilman <khilman@...prootsystems.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the davinci tree with the arm tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> 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.

OK, I'll drop the one from the davinci tree.

Thanks,

Kevin



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/