* linux-next: duplicate patch in the turbostat tree
@ 2025-04-06 20:59 Stephen Rothwell
2025-06-10 4:14 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-04-06 20:59 UTC (permalink / raw)
To: Len Brown; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: duplicate patch in the turbostat tree
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
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-06-10 4:14 UTC (permalink / raw)
To: Len Brown; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 690 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: duplicate patch in the turbostat tree
2025-06-10 4:14 ` Stephen Rothwell
@ 2025-08-12 3:10 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-08-12 3:10 UTC (permalink / raw)
To: Len Brown; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-08-12 3:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox