From: Matt Fleming <matt@codeblueprint.co.uk>
To: Ingo Molnar <mingo@kernel.org>
Cc: "Thomas Gleixner" <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
"Kővágó, Zoltán" <dirty.ice.hu@gmail.com>,
linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org,
"Matthew Garrett" <mjg59@srcf.ucam.org>,
stable@vger.kernel.org, "Matt Fleming" <matt.fleming@intel.com>
Subject: Re: [PATCH] x86/efi: Fix multiple GOP device support
Date: Wed, 14 Oct 2015 16:02:15 +0100 [thread overview]
Message-ID: <20151014150215.GC2782@codeblueprint.co.uk> (raw)
In-Reply-To: <20151014145103.GB17890@gmail.com>
On Wed, 14 Oct, at 04:51:04PM, Ingo Molnar wrote:
>
> Ah, I see, this is a subtle semantic conflict with pending v4.4 EFI changes in
> tip:core/efi, which changed fb_base from u32 to u64:
>
> ae2ee627dc87 ("efifb: Add support for 64-bit frame buffer addresses")
Yeah, that's exactly the issue. I should have given you a heads up
about this but I forgot that there were two patches to this area in
separate branches.
> (Interestingly there was no textual conflict between this patch and that commit.)
>
> So the fix patch is fine as-is for v4.3, but needs a conflict resolution for the
> pending v4.4 commit.
>
> I've applied it that way.
Do you need me to send a patch on top or have you taken care of the
semantic conflict for v4.4? (the change you originally proposed,
s/u32/u64/, looked fine)
--
Matt Fleming, Intel Open Source Technology Center
next prev parent reply other threads:[~2015-10-14 15:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 14:13 [GIT PULL] EFI urgent fix Matt Fleming
2015-10-12 14:13 ` [PATCH] x86/efi: Fix multiple GOP device support Matt Fleming
[not found] ` <1444659236-24837-2-git-send-email-matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2015-10-14 14:47 ` Ingo Molnar
[not found] ` <20151014144715.GA17890-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-10-14 14:51 ` Ingo Molnar
2015-10-14 15:02 ` Matt Fleming [this message]
[not found] ` <20151014150215.GC2782-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2015-10-14 15:04 ` Ingo Molnar
2015-10-14 15:10 ` Matt Fleming
-- strict thread matches above, loose matches on Subject: below --
2015-09-19 13:40 [PATCH] x86/efi: fix " Kővágó, Zoltán
[not found] ` <fce1886dc0b07f374eb49a13746df5e47518d338.1442666763.git.DirtY.iCE.hu-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-10-07 20:48 ` 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=20151014150215.GC2782@codeblueprint.co.uk \
--to=matt@codeblueprint.co.uk \
--cc=dirty.ice.hu@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=mingo@kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).