Messages in this thread | | | From | Arnd Bergmann <> | 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 |
| |
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
| |