Re: [GIT PULL] EFI merge botch fix

From: Ingo Molnar
Date: Tue Apr 30 2013 - 04:47:45 EST

* Matt Fleming <matt@xxxxxxxxxxxxxxxxx> wrote:

> Hi folks,
> This commit fixes the merge botch I created when merging -rc8 into
> tip/x86/efi, where I dropped the "select UCS2_STRING" string from
> drivers/firmware/Kconfig. The string actually needs to be moved to
> arch/ia64 because parts of the core EFI support in drivers/firmware/efi/
> require the ucs2 string functions.
> The following changes since commit e29c2de5f591490fd51225081e5d7579c6699247:
> Merge tag 'v3.9-rc8' into efi-for-tip (2013-04-22 12:53:22 +0100)
> are available in the git repository at:
> git:// efi-for-tip
> for you to fetch changes up to da74caa6cead3f6c55dabcaa7b397b2fddd655e3:
> ia64, efi: select UCS2_STRING when building EFI support (2013-04-29 14:46:15 +0100)
> ----------------------------------------------------------------
> Matt Fleming (1):
> ia64, efi: select UCS2_STRING when building EFI support
> arch/ia64/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
> --
> Matt Fleming, Intel Open Source Technology Center

The other problem is that tip:x86/efi also conflicts with current -git, as
of v3.9 - due to interaction with an EFI fix tree ...

This is getting ugly pretty fast, so I'd suggest to re-do the merges
cleanly, not by rebasing the tree, but by redoing the first merge in

e29c2de5f591 Merge tag 'v3.9-rc8' into efi-for-tip

By correctly merging v3.9-final into f53f292 - making sure the changes to
drivers/firmware/efivars.c correctly merge over, and making sure the ia64
select does not get lost.

Something like this would do:

git checkout -b x86-new-efi-branch f53f292
git merge v3.9
< ... resolve all the conflicts ...>
git commit

I can then (non-fast-forward) fetch this new EFI branch as the new


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at