Re: linux-next: manual merge of the driver-core tree with the drm-xe tree

[Danilo Krummrich]

On Sun Jul 26, 2026 at 11:56 PM CEST, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
>   drivers/gpu/drm/xe/xe_i2c.c
>
> between commits:
>
>   5d8ed6b64220a ("drm/xe/i2c: Allow per domain unique id")
>   9420abf8dbc2e ("drm/xe/i2c: Drop manual VF check")
>
> from the drm-xe tree and commits:
>
>   e766abbc5191b ("drm/xe/i2c: use platform_device_set_fwnode()")
>   0f485f88656af ("drm/xe/i2c: use device_create_managed_software_node()")
>
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

LGTM, thanks!