On Wed, Jul 22, 2020 at 6:34 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Hi all, > > [I can't find a previous email about this, sorry ...] > > There is a semantic conflict between Linus' tree and the amdgpu tree > between commit > > d7a6634a4cfb ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir") > > from Linus' tree and commts > > fe098a5d6443 ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir") > 836dab851903 ("drm/amdgpu/atomfirmware: update vram info handling for renoir") > > The automted git merge leaves two "case 12" labels. I have been > reverting commit d7a6634a4cfb since July 3 ... This will need to be > fixed up when the amdgpu tree is next merged into the drm tree, or a back > merge of d7a6634a4cfb could be done into the amdgpu tree and the older > "case 12" label removed in that merge. Yeah this is a bit nasty, I just crashed over it too (btw moved to drm-next now). Alex is this the right conflict resolution for -next? I think we should bake this in with a backmerge ... -Daniel > > -- > Cheers, > Stephen Rothwell > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch