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

On Fri, Jan 20, 2023 at 2:32 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the accel tree got conflicts in: > > drivers/Makefile > drivers/accel/Kconfig > drivers/accel/Makefile > > between commit: > > 35b137630f08 ("accel/ivpu: Introduce a new DRM driver for

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

Hi all, Today's linux-next merge of the accel tree got conflicts in: drivers/Makefile drivers/accel/Kconfig drivers/accel/Makefile between commit: 35b137630f08 ("accel/ivpu: Introduce a new DRM driver for Intel VPU") from the drm-misc tree and commit: 45886b6fa0f1 ("habanalabs: