From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patch in the turbostat tree
Date: Tue, 12 Aug 2025 13:10:24 +1000 [thread overview]
Message-ID: <20250812131024.2b83c815@canb.auug.org.au> (raw)
In-Reply-To: <20250610141414.205a3b82@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 915 bytes --]
Hi Len,
On Tue, 10 Jun 2025 14:14:14 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Mon, 7 Apr 2025 06:59:23 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > The following commit is also in Linus Torvalds' tree as a different commit
> > (but the same patch):
> >
> > 447c98c1ca4a ("tools/power turbostat: Add idle governor statistics reporting")
> >
> > This is commit
> >
> > ed625c61b85c ("tools/power turbostat: Add idle governor statistics reporting")
> >
> > in Linus' tree.
>
> Due to more changes in Linus' tree, this is now causing a conflict.
> Since this former commit si the only commit in the turbostat tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next),
> maybe it could be dropped.
And another unnecessary conflict today :-( You should just reset the
turbostat tree to v6.17-rc1.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-08-12 3:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-06 20:59 linux-next: duplicate patch in the turbostat tree Stephen Rothwell
2025-06-10 4:14 ` Stephen Rothwell
2025-08-12 3:10 ` Stephen Rothwell [this message]
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=20250812131024.2b83c815@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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