Re: linux-next: Tree for Apr 26
From: Matt Fleming
Date: Mon Apr 29 2013 - 09:51:00 EST
On 29/04/13 09:53, Stephen Rothwell wrote:
> On Mon, 29 Apr 2013 09:11:13 +0100 Matt Fleming <matt.fleming@xxxxxxxxx> 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.
I applied the following to the 'efi-for-tip' branch in the EFI
repository. Unless someone complains I'll send a pull request shortly.
Author: Matt Fleming <matt.fleming@xxxxxxxxx>
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 <mingo@xxxxxxxxxx>
CC: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Cc: Matthew Garrett <matthew.garrett@xxxxxxxxxx>
Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx>
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 9a02f71..da18c8e 100644
@@ -110,6 +110,7 @@ config DMI
+ select UCS2_STRING
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/