From: Matt Fleming <matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
To: "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>,
Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: Tony Luck <tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
Matthew Garrett
<matthew.garrett-05XSO3Yj/JvQT0dZR+AlfA@public.gmane.org>,
Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>,
linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [GIT PULL] EFI merge botch fix
Date: Mon, 29 Apr 2013 19:18:19 +0100 [thread overview]
Message-ID: <20130429181819.GA2254@console-pimps.org> (raw)
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://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.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
WARNING: multiple messages have this Message-ID (diff)
From: Matt Fleming <matt@console-pimps.org>
To: "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>,
Matthew Garrett <matthew.garrett@nebula.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [GIT PULL] EFI merge botch fix
Date: Mon, 29 Apr 2013 19:18:19 +0100 [thread overview]
Message-ID: <20130429181819.GA2254@console-pimps.org> (raw)
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://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.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
next reply other threads:[~2013-04-29 18:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-29 18:18 Matt Fleming [this message]
2013-04-29 18:18 ` [GIT PULL] EFI merge botch fix Matt Fleming
2013-04-30 8:47 ` Ingo Molnar
[not found] ` <20130430084731.GB21473-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-04-30 11:54 ` Matt Fleming
2013-04-30 11:54 ` Matt Fleming
[not found] ` <517FB0F6.9030103-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2013-04-30 14:57 ` H. Peter Anvin
2013-04-30 14:57 ` H. Peter Anvin
-- strict thread matches above, loose matches on Subject: below --
2013-04-30 15:25 Matt Fleming
2013-04-30 15:25 ` Matt Fleming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130429181819.GA2254@console-pimps.org \
--to=matt-hnk1s37rvnbexh+ff434mdi2o/jbrioy@public.gmane.org \
--cc=hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org \
--cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=matthew.garrett-05XSO3Yj/JvQT0dZR+AlfA@public.gmane.org \
--cc=mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org \
--cc=tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.