Skip to contentSkip to conversation

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

DISCUSSION Mark Brown 1 participant 1 message Sep 18 Linux-next tree

lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c

between commits:

12f6eff11ccf9 ("drm/nouveau/gsp/r570: Set GcOff = 0 in fbsr") adb87c20081e5 ("drm/nouveau/gsp/r570: Enable Gcoff in fbsr again")

from the drm-misc-fixes tree and commit:

c7abe771e0138 ("drm/nouveau/gsp/r570: Set GcOff = 0 in fbsr")

from the drm 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.