Skip to contentSkip to conversation

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

PATCH Mark Brown 2 participants 3 messages Jul 27, 2021

Subsystems (4)
DRM drivers DRM misc Linux-next tree DRM driver for VMware virtual GPU
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

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 tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +0 -0
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 356f82c26f59,5652d982b1ce..000000000000
#1 lore raw
Quoted 9 lines · Mark Brown

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:

Quoted 7 lines

ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")

from the drm-next tree and commit:

be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")

from the drm-misc tree.

I got confused for a bit how we managed a conflict here because vmwgfx flows drm-misc.git -> drm.git -> linus. The 2nd patch is in drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed at first drm-misc means.
-Daniel

Quoted 11 lines

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +0 -0
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 356f82c26f59,5652d982b1ce..000000000000
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
author maintainer
#2 lore raw
Quoted 12 lines · Daniel Vetter
Quoted 9 lines · Mark Brown

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:

Quoted 8 lines
Quoted 3 lines

be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")

from the drm-misc tree.

I got confused for a bit how we managed a conflict here because vmwgfx flows drm-misc.git -> drm.git -> linus. The 2nd patch is in drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed at first drm-misc means.

I probably misidentified the tree when I was reporting things TBH - there's so many DRM trees and they're constantly generating conflicts that I sometimes rush through it a bit, especially for the simpler ones like this.