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

[Stephen Rothwell]

Hi all,

On Mon, 7 Apr 2025 06:59:23 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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: pgpBMY1QCMnVt.pgp
Description: OpenPGP digital signature