From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Fleming Subject: Re: linux-next: Tree for Apr 26 Date: Mon, 29 Apr 2013 14:50:47 +0100 Message-ID: <517E7AB7.6050101@intel.com> References: <20130426180357.7599d1b6b7965470905dcdf3@canb.auug.org.au> <20130429093628.b739ef3b879b6f8759bd31af@canb.auug.org.au> <517E2B21.8070009@intel.com> <20130429185322.afaed9fd11269fba9bb09a54@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f176.google.com ([209.85.212.176]:54975 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758400Ab3D2Nuv (ORCPT ); Mon, 29 Apr 2013 09:50:51 -0400 Received: by mail-wi0-f176.google.com with SMTP id hi8so522381wib.3 for ; Mon, 29 Apr 2013 06:50:50 -0700 (PDT) In-Reply-To: <20130429185322.afaed9fd11269fba9bb09a54@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Ingo Molnar , "H. Peter Anvin" Cc: Stephen Rothwell , Geert Uytterhoeven , Matthew Garrett , Linux-Next , "linux-kernel@vger.kernel.org" , linux-efi@vger.kernel.org, Thomas Gleixner , Peter Zijlstra , "Luck, Tony" On 29/04/13 09:53, Stephen Rothwell wrote: > On Mon, 29 Apr 2013 09:11:13 +0100 Matt Fleming wrote: >> >> On 29/04/13 00:36, Stephen Rothwell wrote: >>> 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. >> >> Eek, yes. Sorry about that. How should we resolve this? > > You should probably add a commit that puts the line back in your tree and > get that merged into the tip tree. Tip folks, I applied the following to the 'efi-for-tip' branch in the EFI repository. Unless someone complains I'll send a pull request shortly. commit da74caa6cead3f6c55dabcaa7b397b2fddd655e3 Author: Matt Fleming Date: Mon Apr 29 14:30:28 2013 +0100 ia64, efi: select UCS2_STRING when building EFI support The ucs2 string library functions are required by the core EFI code. Select UCS2_STRING from the EFI symbol entry in arch/ia64/Kconfig, just like we do for x86. This Kconfig bug was caused by a mis-merge in commit e29c2de5f591 ("Merge tag 'v3.9-rc8' into efi-for-tip"). Cc: Ingo Molnar CC: H. Peter Anvin Cc: Tony Luck Cc: Matthew Garrett Signed-off-by: Matt Fleming diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9a02f71..da18c8e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -110,6 +110,7 @@ config DMI config EFI bool + select UCS2_STRING default y config SCHED_OMIT_FRAME_POINTER