Re: linux-next: manual merge of the akpm tree with the drm-intel tree

2020-10-02 Thread Joonas Lahtinen
Quoting Daniel Vetter (2020-10-01 18:13:26) > On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula > wrote: > > > > On Thu, 01 Oct 2020, Daniel Vetter wrote: > > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig wrote: > > >> > > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > >

Re: linux-next: manual merge of the akpm tree with the drm-intel tree

2020-10-01 Thread Daniel Vetter
On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula wrote: > > On Thu, 01 Oct 2020, Daniel Vetter wrote: > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig wrote: > >> > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > >> > Hi all, > >> > > >> > Today's linux-next merge of the akp

Re: linux-next: manual merge of the akpm tree with the drm-intel tree

2020-10-01 Thread Jani Nikula
On Thu, 01 Oct 2020, Daniel Vetter wrote: > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig 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

Re: linux-next: manual merge of the akpm tree with the drm-intel tree

2020-10-01 Thread Daniel Vetter
On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig 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: > > > > 4caf0

Re: linux-next: manual merge of the akpm tree with the drm-intel tree

2020-10-01 Thread Christoph Hellwig
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") > ba2