On 29/04/13 09:53, Stephen Rothwell wrote: > On Mon, 29 Apr 2013 09:11:13 +0100 Matt Fleming <[email protected]> > 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 <[email protected]> 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 <[email protected]> CC: H. Peter Anvin <[email protected]> Cc: Tony Luck <[email protected]> Cc: Matthew Garrett <[email protected]> Signed-off-by: Matt Fleming <[email protected]> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
