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

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/vc4/vc4_plane.c between commit: 35d65ab3fdba ("drm/vc4: plane: Remove redundant assignment") from the drm-misc-fixes tree and commit: 5ddb0bd4ddc3 ("drm/atomic: Pass the full state to planes async atomic

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

On 18/03/2021 03:02, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/omapdrm/dss/dsi.c between commit: 690911544275 ("drm/omap: dsi: fix unsigned expression compared with zero") from the drm-misc-fixes tree and commit: bbd

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

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/omapdrm/dss/dsi.c between commit: 690911544275 ("drm/omap: dsi: fix unsigned expression compared with zero") from the drm-misc-fixes tree and commit: bbd13d6a7b2e ("drm/omap: dsi: fix unreachable code in

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

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_gem.c between commit: 8490d6a7e0a0 ("drm: hold gem reference until object is no longer accessed") from the drm-misc-fixes tree and commit: be6ee102341b ("drm: remove _unlocked suffix in drm_gem_objec

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

Hi all, Today's linux-next merge of the drm tree got a conflict in: include/linux/dma-buf.h between commit: 6f49c2515e22 ("dma-buf: fix documentation build warnings") from the drm-misc-fixes tree and commit: 09606b5446c2 ("dma-buf: add peer2peer flag") from the drm tree. I fixed it up

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

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/arm/display/komeda/komeda_dev.c between commit: 51a44a28eefd ("drm/komeda: Add missing of_node_get() call") from the drm-misc-fixes tree and commit: 8965ad8433ea ("drm/komeda: Enable dual-link support")

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

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/sun4i/sun4i_tcon.c between commit: e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit") from the drm-misc-fixes tree and commit: 34d698f6e349 ("drm/sun4i: Add has_channel_0 TCON qui

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

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_edid.c between commit: 4b4df570b41d ("drm: Update edid-derived drm_display_info fields at edid property set [v2]") from the drm-misc-fixes tree and commit: c945b8c14bb7 ("drm/edid: build ELD in drm_

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

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: include/drm/drm_atomic.h between commit: 7e9081c5aac7 ("drm/fence: fix memory overwrite when setting out_fence fd") from the drm-misc-fixes tree and commit: bdc571464c49 ("drm/atomic: Clean up wait_for_vblanks, v2.")