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
--
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