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

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

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

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

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

2020-10-01 Thread Stephen Rothwell
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

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

2013-08-05 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit a70a3148b0c6 ("drm/i915: Make proper functions for VMs") from the drm-intel tree and commit e6950216e0af ("drivers: convert shrinkers to new count/scan API") from the akpm tree.

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

2013-08-05 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit a70a3148b0c6 (drm/i915: Make proper functions for VMs) from the drm-intel tree and commit e6950216e0af (drivers: convert shrinkers to new count/scan API) from the akpm tree. I

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

2013-07-17 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit 5cef07e16283 ("drm/i915: Move active/inactive lists to new mm") from the drm-intel tree and commit "drivers-convert-shrinkers-to-new-count-scan-api-fix" from the akpm tree. I

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

2013-07-17 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit 5cef07e16283 (drm/i915: Move active/inactive lists to new mm) from the drm-intel tree and commit drivers-convert-shrinkers-to-new-count-scan-api-fix from the akpm tree. I fixed

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

2013-07-07 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit 857d0a9a6e9e ("drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list") from the drm-intel tree and commit

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

2013-07-07 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit 857d0a9a6e9e (drm/i915: Correct obj-mm_list link to dev_priv-dev_priv-mm.inactive_list) from the drm-intel tree and commit drivers-convert-shrinkers-to-new-count-scan-api-fix from