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

On Tue, Jul 27, 2021 at 01:41:30PM +0200, Daniel Vetter wrote: > On Tue, Jul 27, 2021 at 1:15 PM Mark Brown wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > > between commit: > > ebc9ac7c3dfe ("drm/vmwgfx: Update device h

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

On Tue, Jul 27, 2021 at 1:15 PM Mark Brown wrote: > > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > > between commit: > > ebc9ac7c3dfe ("drm/vmwgfx: Update device headers") > > from the drm-next tree and commit: > > be4

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/vmwgfx/vmwgfx_drv.h between commit: ebc9ac7c3dfe ("drm/vmwgfx: Update device headers") from the drm-next tree and commit: be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling") from the drm-misc t