linux-next: manual merge of the drm-misc tree with the origin tree

2025-07-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/etnaviv/etnaviv_sched.c between commit: 61ee19dedb8d ("drm/etnaviv: Protect the scheduler's pending list with its lock") from the origin tree and commits: 0a5dc1b67ef5 ("drm/sched: Rename DRM_GPU_S

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

2022-11-18 Thread Maxime Ripard
On Thu, Nov 17, 2022 at 05:01:08PM -0700, Nathan Chancellor wrote: > On Fri, Nov 18, 2022 at 09:06:36AM +1100, Stephen Rothwell wrote: > > Hi Nathan, > > > > On Thu, 17 Nov 2022 10:29:33 -0700 Nathan Chancellor > > wrote: > > > > > > This resolution is not quite right, as pointed out by clang: >

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

2022-11-17 Thread Nathan Chancellor
On Fri, Nov 18, 2022 at 09:06:36AM +1100, Stephen Rothwell wrote: > Hi Nathan, > > On Thu, 17 Nov 2022 10:29:33 -0700 Nathan Chancellor > wrote: > > > > This resolution is not quite right, as pointed out by clang: > > > > drivers/gpu/drm/vc4/vc4_hdmi.c:351:14: error: variable 'vc4_hdmi' is

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

2022-11-17 Thread Stephen Rothwell
Hi Nathan, On Thu, 17 Nov 2022 10:29:33 -0700 Nathan Chancellor wrote: > > This resolution is not quite right, as pointed out by clang: > > drivers/gpu/drm/vc4/vc4_hdmi.c:351:14: error: variable 'vc4_hdmi' is > uninitialized when used here [-Werror,-Wuninitialized] > mutex_lock(

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

2022-11-17 Thread Nathan Chancellor
Hi Stephen, On Wed, Nov 16, 2022 at 10:57:02AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/vc4/vc4_hdmi.c > > between commit: > > 682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link") > > from

linux-next: manual merge of the drm-misc tree with the origin tree

2022-11-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/vc4/vc4_hdmi.c between commit: 682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link") from the origin tree and commits: d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scr

linux-next: manual merge of the drm-misc tree with the origin tree

2021-11-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c between commit: 9ae807f0ec6a ("drm/amdgpu: clean up inconsistent indenting") from the origin tree and commit: 0d979509539e ("drm/ttm: remove ttm_bo_vm_insert_huge()") from t