From: Matt Fleming <matt@console-pimps.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
linux-efi <linux-efi@vger.kernel.org>
Subject: Re: [GIT PULL] EFI fixes for v3.7
Date: Fri, 26 Oct 2012 10:51:08 +0100 [thread overview]
Message-ID: <1351245068.5303.50.camel@mfleming-mobl1.ger.corp.intel.com> (raw)
In-Reply-To: <20121026082223.GA27378@gmail.com>
On Fri, 2012-10-26 at 10:22 +0200, Ingo Molnar wrote:
> * Matt Fleming <matt@console-pimps.org> wrote:
>
> > Hi guys,
> >
> > The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
> >
> > Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git tags/efi-for-3.7
> >
> > for you to fetch changes up to 5189c2a7c7769ee9d037d76c1a7b8550ccf3481c:
> >
> > x86: efi: Turn off efi_enabled after setup on mixed fw/kernel (2012-10-25 19:09:40 +0100)
> >
> > ----------------------------------------------------------------
> > EFI updates for 3.7
> >
> > Fix oops with EFI variables on mixed 32/64-bit firmware/kernels and
> > document EFI git repository location on kernel.org.
> >
> > ----------------------------------------------------------------
> > Matt Fleming (1):
> > MAINTAINERS: Add EFI git repository location
> >
> > Olof Johansson (1):
> > x86: efi: Turn off efi_enabled after setup on mixed fw/kernel
> >
> > MAINTAINERS | 1 +
> > arch/x86/include/asm/efi.h | 1 +
> > arch/x86/kernel/setup.c | 12 ++++++++++++
> > arch/x86/platform/efi/efi.c | 18 ++++++++++--------
> > 4 files changed, 24 insertions(+), 8 deletions(-)
>
> So, this conflicted with this pending EFI fix in tip:x86/urgent:
>
> 3e8fa263a970 x86/efi: Fix oops caused by incorrect set_memory_uc() usage
>
> I've pulled it and fixed up the conflict - please double check
> the end result.
Damn. Sorry about that.
The fixup looks good, thanks!
--
Matt Fleming, Intel Open Source Technology Center
prev parent reply other threads:[~2012-10-26 9:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-26 7:58 Matt Fleming
2012-10-26 8:22 ` Ingo Molnar
2012-10-26 9:51 ` Matt Fleming [this message]
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=1351245068.5303.50.camel@mfleming-mobl1.ger.corp.intel.com \
--to=matt@console-pimps.org \
--cc=hpa@zytor.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®