[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20130429093628.b739ef3b879b6f8759bd31af@canb.auug.org.au>
Date: Mon, 29 Apr 2013 09:36:28 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: Matt Fleming <matt.fleming@...el.com>,
Matthew Garrett <matthew.garrett@...ula.com>,
Linux-Next <linux-next@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
linux-efi@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>
Subject: Re: linux-next: Tree for Apr 26
Hi all,
On Sat, 27 Apr 2013 19:06:53 +0200 Geert Uytterhoeven <geert@...ux-m68k.org> wrote:
>
> ia64-defconfig:
>
> (.text+0x3956a2): undefined reference to `ucs2_strsize'
> (.text+0x395f82): undefined reference to `ucs2_strsize'
> (.text+0x395fa2): undefined reference to `ucs2_strsize'
> (.text+0x396222): undefined reference to `ucs2_strsize'
> (.text+0x396562): undefined reference to `ucs2_strsize'
> drivers/built-in.o:(.text+0x396722): more undefined references to
> `ucs2_strsize' follow
> vars.c:(.text+0x3975a2): undefined reference to `ucs2_strnlen'
> vars.c:(.text+0x3976f2): undefined reference to `ucs2_strsize'
> efivars.c:(.text+0x398b92): undefined reference to `ucs2_strlen'
> make[1]: *** [vmlinux] Error 1
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/8629073/
>
> It seems to "select UCS2_STRING" introduced by commit
> 0635eb8a54cf0fea64b174bb68bc36b9c3d622db ("Move utf16 functions to
> kernel core and rename") got lost in the drivers/firmware/{=> efi}/Kconfig
> move from commit 048517722cde2595a7366d0c3c72b8b1ec142a9c
> ("efivars: Move pstore code into the new EFI directory")
>
> Don't know who did the mismerge.
Commit e29c2de5f591 ("Merge tag 'v3.9-rc8' into efi-for-tip") by Matt
Fleming from the tip tree merged v3.9-rc8 (which has 0635eb8a54cf) with
the branch that contains 048517722cde but lost the "select UCS2_STRING"
which should be in drivers/firmware/efi/Kconfig.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
P.S. Geert, please trim your replies.
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists