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

[Danilo Krummrich]

On 10/2/25 2:05 PM, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the drm tree got a conflict in:

(I think this was a conflict between the DRM tree and the MM tree already 
before.)

The resolution looks good to me, thanks!

- Danilo