lkml.org 
[lkml]   [2020]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the akpm tree with the drm-intel tree
On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> drivers/gpu/drm/i915/gem/i915_gem_pages.c
>
> between commit:
>
> 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32")
> ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported")
>
> from the drm-intel tree and patch:
>
> "drm/i915: use vmap in i915_gem_object_map"
>
> from the akpm tree.
>
> I fixed it up (I just dropped the changes in the former commits) and

Sigh. The solution is a bit more complicated, but I just redid my
patches to not depend on the above ones. I can revert back to the old
version, though. Andrew, let me know what works for you.

\
 
 \ /
  Last update: 2020-10-01 15:54    [W:2.032 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site