From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: build failure after merge of the final tree (arm-soc tree related)
Date: Sat, 23 Jul 2011 14:36:21 +0200 [thread overview]
Message-ID: <201107231436.22389.arnd@arndb.de> (raw)
In-Reply-To: <20110722164204.15f3bfee0c3ab04adb80e611@canb.auug.org.au>
On Friday 22 July 2011, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (all arm builds)
> failed like this:
>
> arch/arm/mm/Kconfig:835: syntax error
> arch/arm/mm/Kconfig:834: invalid option
> arch/arm/mm/Kconfig:838: unknown option "ARCH_PRIMA2"
>
> Caused by commit 69ca71d177d1 ("Merge branch 'next/soc' of git
> +ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into
> for-next-3") from the arm-soc tree.
>
> This commit mismerged the config CACHE_L2X0 entry (forgot the \ on the end
> of one of the lines).
Thanks for the notification, the problem was in recreating the for-next
branch from the individual branches without testing the result. I'll
be more careful in the future about this.
I've uploaded a new for-next branch now, and will send out pull
requests for the next/* branches next.
Arnd
next prev parent reply other threads:[~2011-07-23 12:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 6:42 linux-next: build failure after merge of the final tree (arm-soc tree related) Stephen Rothwell
2011-07-23 12:36 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-14 23:59 Stephen Rothwell
2012-03-14 23:59 ` Stephen Rothwell
2012-03-14 23:59 ` Stephen Rothwell
2012-03-15 0:20 ` Jason Cooper
2012-03-15 0:20 ` Jason Cooper
2012-03-15 2:08 ` Stephen Rothwell
2012-03-15 2:08 ` Stephen Rothwell
2012-03-15 16:39 ` Arnd Bergmann
2012-03-15 16:39 ` Arnd Bergmann
2012-03-15 17:22 ` Jason Cooper
2012-03-15 17:22 ` Jason Cooper
2012-03-15 17:32 ` Arnd Bergmann
2012-03-15 17:32 ` Arnd Bergmann
2012-03-15 1:53 ` Paul Gortmaker
2012-03-15 1:53 ` Paul Gortmaker
2012-03-15 2:05 ` Stephen Rothwell
2012-03-15 2:05 ` Stephen Rothwell
2012-09-17 11:26 Stephen Rothwell
2012-09-17 11:26 ` Stephen Rothwell
2012-09-17 11:26 ` Stephen Rothwell
2012-09-17 14:11 ` Olof Johansson
2012-09-17 14:11 ` Olof Johansson
2012-09-17 17:23 ` Tony Lindgren
2012-09-17 17:23 ` Tony Lindgren
2012-09-17 14:29 ` Arnd Bergmann
2012-09-17 14:29 ` Arnd Bergmann
2012-09-17 17:22 ` Tony Lindgren
2012-09-17 17:22 ` Tony Lindgren
2012-09-17 20:32 ` Tony Lindgren
2012-09-17 20:32 ` Tony Lindgren
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=201107231436.22389.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.