From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Dave Airlie <airlied@redhat•com>
Cc: DRI <dri-devel@lists•freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lucas De Marchi <lucas.demarchi@intel•com>,
Nam Cao <namcao@linutronix•de>
Subject: Re: linux-next: manual merge of the tip tree with the drm tree
Date: Wed, 26 Mar 2025 16:02:47 +1100 [thread overview]
Message-ID: <20250326160247.23651946@canb.auug.org.au> (raw)
In-Reply-To: <20250313141253.0c5a7520@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1507 bytes --]
Hi all,
On Thu, 13 Mar 2025 14:12:53 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-03-26 5:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 3:12 linux-next: manual merge of the tip tree with the drm tree Stephen Rothwell
2025-03-26 5:02 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-11 3:59 Stephen Rothwell
2019-11-27 0:18 Stephen Rothwell
2019-10-10 1:51 Stephen Rothwell
2019-11-27 23:36 ` Stephen Rothwell
2017-02-17 1:56 Stephen Rothwell
2017-02-01 3:38 Stephen Rothwell
2016-11-17 2:59 Stephen Rothwell
2016-03-17 2:00 Stephen Rothwell
2016-03-17 9:00 ` Arnd Bergmann
2016-03-17 9:39 ` Stephen Rothwell
2016-03-17 16:52 ` Dave Hansen
2014-03-24 3:38 Stephen Rothwell
2012-03-13 5:11 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250326160247.23651946@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@intel$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=namcao@linutronix$(echo .)de \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox