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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250812131024.2b83c815@canb.auug.org.au>
Date: Tue, 12 Aug 2025 13:10:24 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Len Brown <lenb@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patch in the turbostat tree

Hi Len,

On Tue, 10 Jun 2025 14:14:14 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Mon, 7 Apr 2025 06:59:23 +1000 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped