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

2021-08-10 Thread Stephen Rothwell
Hi Geert, On Tue, 10 Aug 2021 13:56:12 +0200 Geert Uytterhoeven wrote: > > On Fri, Aug 6, 2021 at 6:11 PM Mark Brown wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > > > between commit: > > > > e00f543d3596 ("drm/amdg

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

2021-08-10 Thread Geert Uytterhoeven
Hi Mark, Stephen, On Fri, Aug 6, 2021 at 6:11 PM Mark Brown wrote: > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > between commit: > > e00f543d3596 ("drm/amdgpu: add DID for beige goby") > > from the drm-fixes tree and commit: > >

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

2019-03-11 Thread Daniel Vetter
On Mon, Mar 04, 2019 at 11:54:02AM +1100, Stephen Rothwell wrote: > Hi Dave, > > On Fri, 1 Mar 2019 18:29:58 -0500 Alex Deucher wrote: > > > > On Thu, Feb 28, 2019 at 9:24 PM Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the drm tree got a conflict in: > > > > > > driver

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

2019-03-03 Thread Stephen Rothwell
Hi Dave, On Fri, 1 Mar 2019 18:29:58 -0500 Alex Deucher wrote: > > On Thu, Feb 28, 2019 at 9:24 PM Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm tree got a conflict in: > > > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > > between commit: > > > > d6371665

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

2019-03-01 Thread Alex Deucher
On Thu, Feb 28, 2019 at 9:24 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > between commit: > > d63716658ac1 ("drm/amd/display: Use vrr friendly pageflip throttling in > DC.") > >