On Wed, 14 Oct, at 05:04:26PM, Ingo Molnar wrote:
>
> * Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx> wrote:
>
> > > 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)
>
> So to not break bisection in hard to debug ways, I made this fixup in the merge
> commit of your changes, and documented it all in the merge commit message:
>
> commit 790a2ee2427852cff50993c98f15ed88511e9af0
> Merge: c7d77a7980e4 0f96a99dab36
> Author: Ingo Molnar <mingo@xxxxxxxxxx>
> Date: Wed Oct 14 16:05:40 2015 +0200
[...]
> Note: there is a semantic conflict between the following two commits:
>
> 8a53554e12e9 ("x86/efi: Fix multiple GOP device support")
> ae2ee627dc87 ("efifb: Add support for 64-bit frame buffer addresses")
>
> I fixed up the interaction in the merge commit, changing the type of
> current_fb_base from u32 to u64.
>
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Awesome, thanks Ingo.
--
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html