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

[Stephen Rothwell]

Hi all,

On Thu, 13 Mar 2025 14:12:53 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/gpu/drm/i915/i915_pmu.c
> 
> between commit:
> 
>   87b593d79864 ("drm/i915/pmu: Drop custom hotplug code")
> 
> from the drm tree and commit:
> 
>   82ad584eed8b ("drm/i915/pmu: Switch to use hrtimer_setup()")
> 
> from the tip 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.
> 
> 
> diff --cc drivers/gpu/drm/i915/i915_pmu.c
> index 69a109d02116,0ce87f188d11..000000000000
> --- a/drivers/gpu/drm/i915/i915_pmu.c
> +++ b/drivers/gpu/drm/i915/i915_pmu.c
> @@@ -1155,8 -1264,8 +1155,7 @@@ void i915_pmu_register(struct drm_i915_
>   	int ret = -ENOMEM;
>   
>   	spin_lock_init(&pmu->lock);
> - 	hrtimer_init(&pmu->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> - 	pmu->timer.function = i915_sample;
> + 	hrtimer_setup(&pmu->timer, i915_sample, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
>  -	pmu->cpuhp.cpu = -1;
>   	init_rc6(pmu);
>   
>   	if (IS_DGFX(i915)) {

This is now a conflict between Linus' tree and the drm tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpfQifmOOnuH.pgp
Description: OpenPGP digital signature