Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756618Ab3D1Xgp (ORCPT ); Sun, 28 Apr 2013 19:36:45 -0400 Received: from haggis.pcug.org.au ([203.10.76.10]:56171 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754879Ab3D1Xgn (ORCPT ); Sun, 28 Apr 2013 19:36:43 -0400 Date: Mon, 29 Apr 2013 09:36:28 +1000 From: Stephen Rothwell To: Geert Uytterhoeven Cc: Matt Fleming , Matthew Garrett , Linux-Next , "linux-kernel@vger.kernel.org" , linux-efi@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Subject: Re: linux-next: Tree for Apr 26 Message-Id: <20130429093628.b739ef3b879b6f8759bd31af@canb.auug.org.au> In-Reply-To: References: <20130426180357.7599d1b6b7965470905dcdf3@canb.auug.org.au> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Mon__29_Apr_2013_09_36_28_+1000_dEW_lY6F6I/=XZBT" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2969 Lines: 73 --Signature=_Mon__29_Apr_2013_09_36_28_+1000_dEW_lY6F6I/=XZBT Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, On Sat, 27 Apr 2013 19:06:53 +0200 Geert Uytterhoeven wrote: > > ia64-defconfig: >=20 > (.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 >=20 > http://kisskb.ellerman.id.au/kisskb/buildresult/8629073/ >=20 > It seems to "select UCS2_STRING" introduced by commit > 0635eb8a54cf0fea64b174bb68bc36b9c3d622db ("Move utf16 functions to > kernel core and rename") got lost in the drivers/firmware/{=3D> efi}/Kcon= fig > move from commit 048517722cde2595a7366d0c3c72b8b1ec142a9c > ("efivars: Move pstore code into the new EFI directory") >=20 > 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au P.S. Geert, please trim your replies. --Signature=_Mon__29_Apr_2013_09_36_28_+1000_dEW_lY6F6I/=XZBT Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJRfbJ8AAoJEECxmPOUX5FEGaEP/j19g3DuExraOTY0WvZEHm7g C3SeiuFgTL/3B/yt8tLTcRm31II73m/2mOopL5YUIvdjFZ/JIo0A0V0va1R18O3G pChfiafSvFW9Tq6FZwiWKk4WKm5wmFHYYiScT5HZ3Q6jEHi1KLkuprd4mUERhNNr 27TrUHH1WAWpceR21Lq6gsE8mIJ8JlMKdGce92AXlVDVKWM/WAlA3bXR/Z5r0LSX ZYva9cAsBAVXrUR78uZkGVxvTRb5XYs2YTqBotl82hOwVIiLEUsYVIrlyegUlxUC oHJ5URg6u7q6daOV5jzi6W7CpcXrt/rM8fr1uRBb/in6pmhSAvf1POx568XVupv0 Wk1ZBBu9s/X6ADmdGx3odKXJyKhdH+LtAX2t0+gTxXrRgJo/j59WRExQiTug7EvZ 50XOVcLyR6u68kGACoKsBEWAp+mtQ08CToLgQP8nM/I/T6JZXZ6Sb9FDIiyD/Hkc JyFEgvsS9Kw04MIi+usoNubuBmL0hIMiYrhZKm+s8LDt+bvqGb4W+/LbbYH3+fQU +at16bYGRaGW8tb1a2EJWoZ7iKFgyHGdNwVP6L1/iuEC1aoRzFAor4YYTJPh1yCt nlEH6Y0pP72j8KBflHvs9YE8K65GYEPM02VI9vDXZZEIPfm3f+671P7blSfW1d7F H5B0P/ZCGZ0CzmEsvkwX =hnPY -----END PGP SIGNATURE----- --Signature=_Mon__29_Apr_2013_09_36_28_+1000_dEW_lY6F6I/=XZBT-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/