Subject: Re: linux-next: duplicate patch in the turbostat tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 12 Aug 2025 13:10:24 +1000

Hi Len,

On Tue, 10 Jun 2025 14:14:14 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> On Mon, 7 Apr 2025 06:59:23 +1000 Stephen Rothwell <[email-masked]> 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