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

[Mark Brown]

On Mon, Sep 14, 2026 at 04:08:28PM -0700, Nathan Chancellor wrote:

> f65198b3d0738 removed the use of parse_edid_cea() in
> amdgpu_dm_connector.c but it looks like Mark put these functions back
> into place to keep everything building and working for 0412b1064a3bd
> when the two are merged together.

To be clear my current merge is junk, it's one of those occasional ones
where the constant stream of noisy conflicts caused issues when there
was actually something meaningful and I was fixing up later after rerere
had stored a badly broken resolution.  I was hoping the AMD people would
merge up the conflicting branch or give me a fixup so we had a proper
resolution in -next, I haven't had any input from them.

> Given f65198b3d0738, it seems like 0412b1064a3bd is pointless and could
> be reverted entirely to try and avoid this conflict altogether? I tested
> the following diff and it seems to build cleanly for me.

That does look sensible to me, I might try that next time this conflict
recurs.

Attachment: signature.asc
Description: PGP signature