On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig hch@lst.de wrote:
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")
Uh these patches shouldn't be in linux-next because they're for 5.11, not the 5.10 merge window that will open soon. Joonas?
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.
Imo ignore, rebasing onto linux-next without those intel patches was the right thing for the 5.10 merge window. -Daniel