linux-kernel - Re: FW: next build fails

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]

Date:	Thu, 16 Sep 2010 10:00:07 -0700
From:	Daniel Walker <dwalker@...o99.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Sundar R IYER <sundar.iyer@...ricsson.com>,
	Linus WALLEIJ <linus.walleij@...ricsson.com>,
	Russell King <rmk@....linux.org.uk>,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: FW: next build fails

On Thu, 2010-09-16 at 16:44 +1000, Stephen Rothwell wrote:

> This is due to a mismerge (in linux-next) between commit
> dc966984f44f16b8bb6b0644e501c7c2163ead69 ("ARM: Allow SMP kernels to boot
> on UP systems") from the arm tree (which renamed PMD_FLAGS to
> PMD_FLAGS_UP) and commit b7bc5d9c6556e3ca37176784036380f91b53432c ("arm:
> mm: add proc info for ARM11MPCore/Cortex-A9 from ARM") from the msm tree
> (which added a new use of PMD_FLAGS).
> 
> I will add the above patch as a merge fixup to my tree until the msm tree
> gets merged into the arm tree (or vice versa or they both are merged into
> Linus' tree).

__v7_ca9mp_proc_info should just duplicate __v7_proc_info (the one below
it) ..

Daniel

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