linux-kernel - linux-next: build failure after merge of the final tree (arm-soc tree related)

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-next>] [day] [month] [year] [list]

Message-Id: <20110722164204.15f3bfee0c3ab04adb80e611@canb.auug.org.au>
Date:	Fri, 22 Jul 2011 16:42:04 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: build failure after merge of the final tree (arm-soc
 tree related)

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).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped