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

2024-10-07 Thread Stephen Rothwell
Hi all, On Fri, 4 Oct 2024 12:18:00 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-xe tree got a conflict in: > > drivers/gpu/drm/xe/xe_guc_submit.c > > between commit: > > 9286a191abe2 ("drm/xe: Drop GuC submit_wq pool") > > from the drm-misc-fixes tree and commit

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

2024-10-03 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-xe tree got a conflict in: drivers/gpu/drm/xe/xe_guc_submit.c between commit: 9286a191abe2 ("drm/xe: Drop GuC submit_wq pool") from the drm-misc-fixes tree and commit: 861108666cc0 ("drm/xe: fix UAF around queue destruction") from the drm-xe