From: Daniel Walker <dwalker@fifo99.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Sundar R IYER <sundar.iyer@stericsson.com>,
Linus WALLEIJ <linus.walleij@stericsson.com>,
Russell King <rmk@arm.linux.org.uk>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: FW: next build fails
Date: Thu, 16 Sep 2010 10:00:07 -0700 [thread overview]
Message-ID: <1284656407.2411.5.camel@c-dwalke-linux.qualcomm.com> (raw)
In-Reply-To: <20100916164442.df749cc1.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-09-16 17:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <33A307AF30D7BF4F811B1568FE7A9B18043784FF99@EXDCVYMBSTM006.EQ1STM.local>
2010-09-16 6:44 ` FW: next build fails Stephen Rothwell
2010-09-16 17:00 ` Daniel Walker [this message]
2010-09-16 21:52 ` Stephen Rothwell
2010-09-16 21:58 ` Daniel Walker
2010-09-16 22:04 ` Stephen Rothwell
2010-09-16 22:08 ` Daniel Walker
2010-09-17 10:35 ` Russell King
2010-09-17 15:44 ` Daniel Walker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284656407.2411.5.camel@c-dwalke-linux.qualcomm.com \
--to=dwalker@fifo99.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=sundar.iyer@stericsson.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox